novice: Copy-paste from origin/master
I couldn't find a way to merge these without clobbering a bunch of
other files, so this is just a copy-paste of the current status as of
e4b84bd (Merge pull request #359 from
swcarpentry/ahmadia/dhaine_r_ref, 2014-03-06).