Replace dashes with underscores
Merge pull request #11 from jpmontez/master

Replace dashes with underscores
Change lab CIDRs
Merge pull request #12 from jpmontez/master

Change lab CIDRs
initial look at templating out selection of cinder backend
added child templates
merged cinder templating