keep git directory around since prep needs it
Merge branch 'master' of github.com:thejayvm/dotfiles