Merge branch 'master' of github.com:DaveHarrington/config

Conflicts:
	.bashrc
Merge branch 'master' of github.com:DaveHarrington/config