Updated sublime-text-2 user preferences
Merge branch 'master' of https://github.com/chrismitchell/sublime-user-settings

Conflicts:
	sublime-text-2-user-pref.json