updates
Merge branch 'master' of github.com:mrhanlon/sublime-text-2-settings