novice/shell: 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
a42f07f (Merge pull request #347 from gvwilson/sticking-with-jekyll,
2014-03-12).