Merge branch 'master' of github.com:benjaminfjones/dotfiles

Conflicts:
	gitconfig
Merge branch 'master' of github.com:benjaminfjones/dotfiles