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

Conflicts:
	.gitconfig