new settings
Merge branch 'master' of github.com:existentialmutt/dotfiles

Conflicts:
	Sublime Text 2 User Package/Preferences.sublime-settings