fix makefile problems
Merge branch 'master' of https://github.com/nzl-nott/PhD-of-nzl

Conflicts:
	2013 TYPES Paper/makefile
fixes