Ignore all derivatives of DS_Store
Ignore OS X Finder nonsense files
Merge branch 'master' of github.com:jdavis/dotfiles