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

Also removes the base socorro class.