Moved .bash_profile contents to .bashrc and sourced .bashrc from .bash_profile. This should make things consistent across platforms.
Merge branch 'master' into remote-server

Conflicts:
	.bash_profile