update generator for Vagrant 1.5.x

This also simplifies the Berkshelf configuration by removing some less common options that
a power user will just carve out of the Vagrantfile themselves.
Merge pull request #1103 from berkshelf/update-vagrant

update generator for Vagrant 1.5.x