Update settings
Merge branch 'master' of github.com:andsens/sublime-text-3-settings