Update
Merge branch 'master' of https://github.com/tmandry/sublime-settings
Fix gitignore