settings
Merge branch 'master' of github.com:mastfish/sublime-settings