keeping up to date with some changes across 3 machines
Merge branch 'master' of git://github.com/connanp/dotfiles

* 'master' of git://github.com/connanp/dotfiles:
  fix editor in .zprofile