Merged .bashrc logic across computers

- Removed extra plugin stuff