Vagrantfile added + misc improvements