preferences updated
Merge branch 'master' of https://github.com/henryoz/sublime-text-user-settings