compressed stuff
Merge branch 'datamodel' of http://github.com/cbaesema/openstack-working into datamodel

Conflicts:
	nodes.txt