Add two missing lines in redirect setup
Missing heat_auth_encrypt_key
Merge pull request #109 from knowncitizen/heat_auth

Missing heat_auth_encrypt_key
Merge pull request #105 from pitr-ch/master

Delete TODO section
new ceilometer params

Added ceilometer and ceilometer_host to correspond with
https://github.com/redhat-openstack/astapor/pull/169
Merge pull request #107 from sseago/ceilometer_configuration

new ceilometer params
Do not delete machines from deployment when populating
Add links to hosts in Deploy detail page
Go directly to step 3 services_configuration when deployment.deployed?

Conflicts:
	app/views/staypuft/deployments/show.html.erb
Merge pull request #112 from pitr-ch/orchestration2

UX improvements
Version bump
Merge pull request #113 from ares/master

Version bump