mostly code cleanup; fixed problematic varnish parameter
Merge branch 'master' of github.com:hipponot/vagrant