Default to VirtualBox (not to go upstream)
Merge branch 'master' of github.com:cyberswat/drupal-lamp
Begin test coverage
Add databags to kitchen test
test
remove whitespace
Run test kitchen on travis
Add vagrant to travis
add testing data
Merge branch 'master' of github.com:newmediadenver/drupal-lamp

Conflicts:
	Vagrantfile
Add vagrant config to kitchen yaml
Fixes #135
Add custom vagrantfile template
modify vagrantfile.erb
Update kitchen yml
Add test sql file
Add import test suite
Remove unneeded databags and add template serverspec for import suite
Add drupal make test suite
re-order test suites