task: now that mitchellh/vagrant#1307 is merged, remove our workaround
task: update comment with new Vagrant version
Merge remote-tracking branch 'origin/master' into feature/update-cookbooks