Trivial
Merge branch 'master' of https://github.com/flyondrag/sublime-settings