Merge pull request #648 from RiotGames/metadata_constraints

Fix broken metadata constraints
Conflicts:
	lib/berkshelf/berksfile.rb
	spec/unit/berkshelf/berksfile_spec.rb