updated CHANGELOG
Merge branch '4.2-dev' of https://github.com/adaptivecomputing/torque into 4.2-dev
Updated CHANGELOG

Conflicts:
	CHANGELOG