Updating Vagrantfile, adding some performance enhancements
Merge branch 'master' into zf2