Updated atom config
Merge branch 'master' of github.com:mauricerkelly/dotfiles

Conflicts:
	atom/atom.symlink/config.cson