remove gem dependency on Vagrant

add locks to gemspec to preserve compatibility with Vagrant 1-0-stable
explicitly require 'berkshelf/vagrant' in spec_helper for testing

add Vagrant to development gemset for testing/development
Merge pull request #288 from RiotGames/remove-vagrant-dep

Berkshelf gem should not depend on Vagrant gem
version bump 1.1.5
Merge branch '1-1-stable'

Conflicts:
	Gemfile
	berkshelf.gemspec
	spec/spec_helper.rb
add vagrant to development and test gem group
Merge pull request #344 from RiotGames/fix-travis

add vagrant to development and test gem group
Merge branch '1-1-stable'
Move moneta from Gemfile to gemspec
Merge pull request #350 from RiotGames/346-moneta-dep

Move moneta from Gemfile to gemspec
version bump 1.1.6
Generate cookbook repo at path to avoid remote git clone
Use local git origin for clone spec
Show status of master branch in Travis badge
Use local git remote for checkout spec
Use local remote for rev_parse spec
Capture stdout
Set ENV['LANG'] back after Facter clobbers it
Merge branch '1-1-stable'
Revert "Merge with RiotGames/master"

This reverts commit ccc07a4ad981956a4554a1e6c03b6c0a538ae140, reversing
changes made to 61c49a93331a1aa9e83d6a62b5705bb6a8e2fee4.

Conflicts:
	README.md
	berkshelf.gemspec
	features/lockfile.feature
	features/update_command.feature
	lib/berkshelf.rb
	lib/berkshelf/command.rb
	lib/berkshelf/installer.rb
	lib/berkshelf/ui.rb
	lib/berkshelf/updater.rb
	spec/spec_helper.rb
	spec/unit/berkshelf/cookbook_generator_spec.rb
	spec/unit/berkshelf/installer_spec.rb
	spec/unit/berkshelf/lockfile_spec.rb
	spec/unit/berkshelf/ui_spec.rb
	spec/unit/berkshelf/updater_spec.rb
	spec/unit/berkshelf/uploader_spec.rb