Do not refer to Heat as OpenStack Orchestration

http://lists.openstack.org/pipermail/openstack-dev/2014-February/026323.html
Merge pull request #34 from vuntz/naming

Do not refer to Heat as OpenStack Orchestration
Merge pull request #35 from crowbar/release/roxy/master

Sync with roxy