Fixed some defines
Merge branch 'master' of https://github.com/tcew/OCCA2

Conflicts:
	scripts/occaKernelDefinesGenerator.cpp