Start of new non-recursive build
Merge branch 'master' of https://www.github.com/simongustavsson/nox

Conflicts:
	Makefile