Merge pull request #1259 from edx/han/vagrant-vmware

Updating VMWare Vagrant Box images
Merge pull request #1260 from edx/release

Merge pull request #1259 from edx/han/vagrant-vmware