Update popHealth config to match what is in the master branch of popHealth.
Remove lock on vagrant-berkshelf plugin version, since the released version of the plugin is no longer broken.
Merge pull request #13 from pophealth/updateConfig

Update popHealth config.yml and berkshelf plugin version.