updated bash initialisation stuff

consolidated exports and aliases into one bashrc
updated Makefile