remove e-mail address so I'm forced to configure it on a per repository basis
Merge branch 'master' of github.com:ajw/dotfiles