Updated Sublime settings.
Merge branch 'master' of github.com:jonathanio/dotfiles

Conflicts:
	sublime/Packages/User/Preferences.sublime-settings