Merge pull request #1 from MatthewFluet/master

Post conversion git and GitHub changes.