Rebase of pull request 64 onto latest gh-pages

This is a rebase of the commits from randomecho that are part of pull request 64: git reset does not affect commit, but changes index, stage to them.

I did this rebase because randomecho's pull request is 8 months old at this point, but his changes are sorely needed to make the "reset" command instructions correct.