fix bug 1039876 - move socorro.pp to vagrant.pp
Merge pull request #2214 from rhelmer/bug1039876-move-puppet-manifest-for-vagrant

fix bug 1039876 - move socorro.pp to vagrant.pp