Tell git to ignore some things.
Merge branch 'master' of github.com:kablamo/dotfiles