allow circle API env overrides
Merge branch 'master' of github.com:rackspace-orchestration-templates/lamp
Removed non-existant RHEL 7 choice