Add .DS_Store to gitignore.
Merge branch 'master' of github.com:erbridge/sublime-text-settings