Revert "week3 + new Vagrantfile for 2 server types"

This reverts commit 2682fff8a08c441323c7ab7f496f3d75b33a4425.
WEEK3: separate Vagrantfile for each week

and regression test with weeks 1 & 2