Redid a bunch of settings
Merge branch 'master' of github.com:jonesbp/sublime