.bashrc updates.
Merge branch 'master' of github.com:stephenmelrose/dotfiles

Conflicts:
	.bashrc