Tidied up some undergrad stuff out of bashrc
Merge branch 'master' of github.com:cfogelberg/homedir