Update CHANGELOG
Merge branch 'master' of https://github.com/mitchellh/vagrant
Update CHANGELOG