Use puphpet vagrant stuffz.
Merge branch 'puphpet'