updated settings
Merge branch 'master' of https://github.com/eliasbrange/sublime-settings