pulling heaps of updates

since i started work on the puppet-3 server i seems like time to do
this. I also froze infra updates on the current puppet server.
Merge branch 'master' of github.com:purplehazech/puppet-infra-project