Merge pull request #123 from puppetlabs/master

merge master into folsom
* Update example/site.pp, as reference to https://github.com/puppetlabs/puppetlabs-openstack_dev_env.
* Tested with multi-node mode + cinder.
* TODO: Test all-in-one mode.
* TODO: Test quantum.
Merge pull request #125 from hswong3i/folsom

Update example/site.pp for Folsom
* Tested with all-in-one mode.
* Add URL for installation example.
Merge pull request #126 from hswong3i/folsom

* Tested with all-in-one mode.
Merge pull request #139 from puppetlabs/master

merge folsom changes from master
Merge branch 'folsom' of github.com:stackforge/puppet-openstack into folsom

Conflicts:
	tests/site.pp