Merge pull request #3 from dwarduk/makefile

Makefile
Merge pull request #4 from dwarduk/bashrc_stuff

Bashrc stuff
Merge pull request #5 from dwarduk/bashrc_stuff

Bugfix on bash prompt
One liner for LDAP search on Cambridge students with crsid
Merge pull request #6 from dwarduk/master

Copied the PartIA makefile, and updated for fjava
Merge pull request #2 from madgen/master

Merge changes from upstream