Raise order a bit

We want this to be listed before tempest
Merge pull request #77 from dirkmueller/release/stoney/master

Raise order a bit
Update templates to Icehouse
Merge pull request #78 from dirkmueller/master_heat_conf_update

Update templates to Icehouse