fix bug 1094720; tidy repo cfg, etc
Merge pull request #2469 from phrawzty/bug1094720__tidy_puppet_repo_cfg

fix bug 1094720; tidy repo cfg, etc