Fix typos
Merge branch 'master' of git://github.com/jimt/gun