changes to bashrc
Merge branch 'master' dotfiles

Conflicts:
	dotfiles/bashrc