Fix type-o in rabbitmq.yaml.
Create a utility for merging templates.
Replace in AllowedResources
Support DependsOn
Add ability to combine roles into one role.
Add a 'notcompute' template.
Add a smaller scale heat-allinone template.
Simplify keystone into one instance.
Adding OpenStack:: hints to engine
Make descriptions less redundant.
Add glance heat and keystone to notcompute
Removing unused TemplateURL
Add a Makefile for regenerating common merges
Use slave roles in Makefile.
Remove unused NovaAPISize from nova-api
Hand modified notcompute.yaml to work properly.
Adding username/password for Nova in notcompute.
Hand modifying notcompute to work with elements.
Pushing passwords into mysql and other fixes.

Generating and distributing usernames/passwords is just too complicated
with Heat at this stage, so we need to push them into mysql from the
template.
Fixed the nova-compute template.