updating flavor names
updating flavor names
Merge pull request #5 from rackspace-orchestration-templates/merge_phil

Merge phil