Still working on OSX build.
Merge branch 'master' of https://github.com/JSkelly/TroubleInCloudLand

Conflicts:
	setup/Trouble in CloudLand.win32.spec