Revert "Ensure Travis runs with the right Puppet"

This reverts commit e12dbd2f9ac6b89b213419f19e8b6811e904eddd.
Ensure right Puppet version in place for Travis

Keep PUPPET_VERSION for any existing uses, use PUPPET_GEM_VERSION for the
version spec that is supplied via .travis.yml.