New settings
Fixed conflicts
Merge branch 'master' of github.com:badsyntax/sublime-text-settings