Fixing module file path for ec2::mgmt, removing rubygems-json package
that doesn't exist, adding a tag to puppetmaster
Merge branch 'production' of github.com:huit/openshift-poc into production