Update to newest test-kitchen and kitchen-vagrant releases.
Remove Vagrantfile

This has been rendered obsolete by Berkshelf's Vagrant support being a
separate plugin as of Vagrant 1.1 and Berkshelf 1.3

The kitchen Vagrant plugin now supports Vagrant 1.1 and no longer
requires that Vagrant know about the plugin.
Merge branch 'master' into vagrant_upgrade

Re-locked test-kitchen to officially released gem version

Conflicts:
	Gemfile