Switch editor to atom and adjust aliases.
Merge branch 'master' of github.com:delynn/dotfiles

* 'master' of github.com:delynn/dotfiles:
  Add git alias for merging.