prefs update
Merge branch 'master' of https://github.com/mrmartineau/SublimeText3UserSettings

* 'master' of https://github.com/mrmartineau/SublimeText3UserSettings:
  update settings

Conflicts:
	Preferences.sublime-settings
update tmtheme
Merge branch 'master' of https://github.com/mrmartineau/SublimeText3UserSettings

* 'master' of https://github.com/mrmartineau/SublimeText3UserSettings:
  update