Rewrite deploy.rb to deploy on wheezy

Plus:
 - tweak Vagrantfile
 - tweak puppet node definition to use new parameters
Pull apache class out of umurauto and toshokan classes

Otherwide it would be defined twice on a machine with both
umurauto and toshokan