Use Atom as default git editor
Install more Sublime packages
Merge branch 'master' of github.com:kasperisager/dotfiles

* 'master' of github.com:kasperisager/dotfiles:
  Where did you come from?
  Install more Sublime Packages
  Improvements to `fish_prompt`

Conflicts:
	sublime/Package Control.sublime-settings