week3 + new Vagrantfile for 2 server types