Tidy up the Makefile a bit, though it should be changed to not hard code my local settings