Revert "Set puppet version to 2"

This reverts commit 67d17a75645825f2c3940e2cdb4a0b948f316115.
Infra's moving to puppet 3
Add pip mirror