Now supports Vagrant 2 and some other minor fixes