predef test changes
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	lib/megam/core/predefcloud.rb
Merge remote-tracking branch 'origin/master'
changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	lib/megam/core/predefcloud.rb
	megam_api.gemspec
	test/test_predefclouds.rb
Merge remote-tracking branch 'origin/master'
Add cloud_tool_settings

Conflicts:
	lib/megam/core/predefcloud.rb
	test/test_nodes.rb
	test/test_predefclouds.rb
	test/test_requests.rb