settings update pre-merge
merge prefrences... oops got desynced...
Merge branch 'master' of github.com:admalledd/sublime_text

Conflicts:
	Preferences.sublime-settings