Makefile now sets paths etc.
Merge pull request #5 from ramsay-t/current

Makefile now sets paths etc.