Fix copy-paste in README

Change GRE to VXLAN
Merge pull request #1 from redixin/master

Fix copy-paste in README
Remote merge
Merge branch 'master' of github.com:CSSCorp/openstack-automation
icehouse yaml
corrupted
fixed icehouse yaml