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

Conflicts:
	bash/bashrc