Merge branch 'master' of https://github.com/thoughtworks/pacto into issue25

Conflicts:
	lib/pacto.rb
	spec/unit/pacto/pacto_spec.rb