ds_store added to gitignore
Merge branch 'master' of github.com:japaniel/dotfiles