update
Merge branch 'master' of https://github.com/mikemclin/sublime-text-settings