Stuff and things.
Merge branch 'master' of https://github.com/mjcarroll/dotfiles

* 'master' of https://github.com/mjcarroll/dotfiles:
  Add no whitespace git alias.
  Local changes from etoo.