disabled trim trailing whitespace on save
Merge branch 'master' of https://github.com/b-lambert/sublime-settings
added Package Control.sublime-settings