Sync
Merge branch 'master' of github.com:leek/dotfiles

* 'master' of github.com:leek/dotfiles:
  Syncing Atom config
  Switching to Atom

Conflicts:
	sublime-text/User/Preferences.sublime-settings