OSX specific bashrc changes
Lots of new stuff
Merge branch 'master' into osx
Merge branch 'osx' into rover