Added trq_cgroups.h to src/include/Makefile.am
Merge branch 'feature/numa' of https://github.com/adaptivecomputing/torque into feature/numa

Conflicts:
	src/include/Makefile.am