Added Vagrant setup
Minor fixes