Changes for make commands and predefclouds
cleanup deadcode
Merge remote-tracking branch 'rt/master'

Conflicts:
	test/test_nodes.rb