Fix copy-paste in README

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

Fix copy-paste in README
readme
Json formulas for openstack ice house
pillar modification
Ice house networking options
Merge branch 'icehouse-json' of github.com:CSSCorp/openstack-automation into icehouse-json
Remote merge
Merge branch 'master' of github.com:CSSCorp/openstack-automation
icehouse yaml
corrupted
fixed icehouse yaml
cinder support
merge icehouse-yaml to master
restructure file system
rename fileroot and pillar root
pillar data normalization and organization
update readme
added git ignore
gitignore
mysql distro agnostic