fix bug 1062911 - Refactor Puppet Files

This brings our vagrant puppet configs more in line with puppet standards, and should hopefully reduce the failure rate of random puppet applies.

[fix bug 1062911](https://bugzilla.mozilla.org/show_bug.cgi?id=1062911)