Update bashrc.
Merge branch 'master' of github.com:moznion/dotfiles

Conflicts:
	bash/.bashrc