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
Show status of master branch in Travis badge
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
repair travis-ci build job
fix broken features in upgrade command

check for text not JSON in lockfiles
Merge pull request #355 from RiotGames/backout-lockfile

backout PR #298
Merge pull request #270 from RiotGames/270-facter-env

Loading berkshelf sets locale to C
Merge branch 'master' into git_spec_cleanup

Conflicts:
	spec/unit/berkshelf/git_spec.rb
Move vagrant development dependency to gemspec
Merge pull request #352 from RiotGames/git_spec_cleanup

Git spec cleanup
Merge pull request #356 from RiotGames/vagrant-dev-dep

Move vagrant development dependency to gemspec
Add Cane

* Can be invoked with `cane` or `thor spec quality`
* Settings are in ./.cane
* Currently allowing violations for our current codebase
* Will fail the build if quality or coverage gets any worse
Set line length to 120, update violations count to match
Reduce coverage to 90%, increase violation to 100
Add guard-cane
Only enforce coverage on full CI run