Added osx specific bashrc stuff.
Merged master.