Some updates.
Merge branch 'master' of github.com:pharpend/dotfiles

Conflicts:
	general/home/.gitconfig