Update template for either new version of openstack or new openstack

Vagrant 1.6.3
vagrant-openstack-plugin (0.7.0)

Openstack Icehouse
Update readme for compatibility with Openstack (@OICR old) and Openstack

(@OICR Icehouse)
Fix typo
Merge branch 'develop' into feature/icehouse_compatible

Conflicts:
	README.md
Merge branch 'develop' into feature/icehouse_compatible
Merge pull request #18 from CloudBindle/feature/icehouse_compatible

Merged #18 (Feature/icehouse compatible into develop)