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