Default to VirtualBox (not to go upstream)
Merge branch 'master' of github.com:cyberswat/drupal-lamp
Merge branch 'master' of github.com:newmediadenver/drupal-lamp

Conflicts:
	Vagrantfile
Fixes #135
Merge pull request #137 from speedytwenty/master

Fix to incorrect plugin in README
Merge branch 'master' into testing
update Berksfile ref