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

* 'master' of https://github.com/mrmartineau/SublimeText3UserSettings:
  Delete Gist.sublime-settings
  Update Gist.sublime-settings
  Update settings
  intial commit

Conflicts:
	Default (OSX).sublime-keymap
	Emmet/snippets-kickoff.json
	Package Control.sublime-settings
	Preferences.sublime-settings
	Side Bar.sublime-settings