Add .DS_Store to gitignore_global.
Merge branch 'master' of git://github.com/tfentonz/dotfiles