Add atom config.
Merge branch 'master' of github.com:delynn/dotfiles

* 'master' of github.com:delynn/dotfiles:
  Remove the common aliases plugin.
  Add color to ls commands.
  Switch editor to atom and adjust aliases.
  Add git alias for merging.
  Fix git branch autocomplete.
  Remove sublime aliases since we now use the sublime plugin.
  Moar plugins, and fix load order.
  Update license.
  Add new aliases.
  No longer using pow.