Moved relevant parts of .bash_profile into .bashrc; .bashrc is mostly standard Ubuntu settings now