Update settings.
Merge branch 'st3' of github.com:florianeckerstorfer/sublime-config into st3

* 'st3' of github.com:florianeckerstorfer/sublime-config:
  Updated settings.

Conflicts:
	Preferences.sublime-settings