Changed default Git editor to Atom
Merge branch 'master' of github.com:mikefowler/dotfiles

* 'master' of github.com:mikefowler/dotfiles:
  Update