WIP changes from jacob in support of getting Connect running in the dev environment jeff has going
Merge branch 'connect' of github.com:connectsolutions/puppet-dev-environment into connect