Added better "extra" sourcing
Merge branch 'master' of https://github.com/sheedy/dotfiles

Conflicts:
	home/.gitconfig