disable vagrant-berkshelf plugin by default because test-kitchen already takes care of the dependency resolution
re-add accidentally deleted newline
remove config option and always disable vagrant-berkshelf if present
fix unrelated trailing whitespace to make travis-ci happy again
Merge pull request #126 from tknerr/disable-vagrant-berkshelf-plugin

Disable vagrant-berkshelf plugin by default...