Misc fixes and force plugin to work with Vagrant 1.5+