Some headers; switch to gmake
Merge commit 'ac601f1'

Conflicts:
	README.md
workwork