Added Vagrant, and other minor fixes