media gitconfig stuff?
Merge branch 'master' of github.com:davidosomething/dotfiles