updates
Merge branch 'master' of https://github.com/keithjgrant/dotfiles

Conflicts:
	.gitconfig