line break before the shell prompt (genius!)
more git fat-fingering
new Sublime Text preferences
Merge branch 'master' of https://github.com/alltom/dotfiles

Conflicts:
	Preferences.sublime-settings
was sourcing this file twice