updating flavor names
Merge pull request #32 from CaptBeardie/master

Adding Cent 7 and "group_by" mechanics
Merge branch 'master' of github.com:rackspace-orchestration-templates/lamp