Now using .bashrc instead of .bash_profile, minor updates to scripts