Latest changes on laptop to .bash_profile and .bashrc.
Merge branch 'master' of https://github.com/ndronen/misc

Conflicts:
	dotfiles/.bash_profile
	dotfiles/.bashrc