Cleaned up the Makefile path definitions. Updated docs.