Some Rubocop cleanup of the Vagrantfile
Clean up comments in Berksfile for local testing
Prefer Ubuntu for AWS-based Vagrant testing