Updating makefile and config to work on afs as well