Fix lockfile speed issues
Force locked_version on version_constraint (fixes #637)
Gracefully fail LockfileParserError and handle empty lockfiles
update error message that an error occured while reading the lockfile and

not that the file couldn't be read
Merge pull request #686 from RiotGames/lockfile_parser_error

If a Berksfile.lock is empty, berks stacktraces trying to read it
Merge pull request #683 from RiotGames/fix_lockfile_speed

Fix lockfile speed issues (2-0-stable)
version bump 2.0.5
update changelog for 2.0.5
Pin activesupport to 3.2
Merge pull request #710 from RiotGames/pin_activesupport

ActiveSupport 4.0 breaks everything
always resolve dependencies

at present if there's a lockfile all the dependencies from it are
returned, which blows at least :except (and probably :only) out of the
water. Now we'll try and use locked versions, but only after resolving
the groups we want.

Conflicts:
	lib/berkshelf/berksfile.rb
test that --except works with a lock file
remove lockfile sha support across the board

Conflicts:
	features/lockfile.feature
	features/update_command.feature
	lib/berkshelf/berksfile.rb
	lib/berkshelf/lockfile.rb
	spec/fixtures/cookbooks/example_cookbook/Berksfile.lock
	spec/unit/berkshelf/berksfile_spec.rb
	spec/unit/berkshelf/lockfile_spec.rb
clobber extraneous newline
Lockfile#update no longer needs an options arg

Conflicts:
	lib/berkshelf/lockfile.rb
update comment on locking algorithm
fix up whitespace a touch
Missed one
Git sucks at cherry picking
Merge pull request #711 from RiotGames/backport_dependencies_fixes

Backport dependencies fixes