Refactor Puppet files to follow Puppet conventions

fix bug 1062911
Move puppet site.pp back to vagrant.pp
Include the socorro::vagrant class on default node

Also removes the base socorro class.
Merge pull request #2340 from bramwelt/fix-bug-1062911-puppet-socorro-module

fix bug 1062911 - Refactor Puppet Files