Catchup upstream changes and refactor Vagrantfile and config.rb