Syncing up my Sublime Text Settings.
Merge branch 'master' of github.com:rogeruiz/sublime-settings

Conflicts:
	Git Commit Message.sublime-settings
	Preferences.sublime-settings