Adding cmake stuff to git
Make the cmake errors easier to debug
Merge branch 'cmake'

Conflicts:
	Makefile.inc
	nui/Makefile