add git-media
Merge branch 'master' of github.com:jschaf/dotfiles

Conflicts:
	.gitconfig
fix line-endings