Moved OSX stuff to the bashrc_osx file and removed some aliases.