Made some configuration changes.
Merge branch 'master' of github.com:shapov/sublime-text-preferences

Conflicts:
	Package Control.sublime-settings