missed a java 1.6 thing
backport fix to json4s so we don't need to rely on snapshot
update docs
move Main into a package
sbt plugin for running provider pacts
lots of refactoring to try and allow multiple consumer tests to write to the same pact file
update docs for sbt plugin
improve error logging
update java pact consumer DSL
improve failure output
allow cross origin requests to support javascript hack
Merge branch 'master' of https://github.com/DiUS/pact-jvm

Conflicts:
	consumer/build.sbt
	consumer/src/main/scala/com/dius/pact/consumer/PactVerification.scala
	provider/src/main/scala/com/dius/pact/runner/PactSpec.scala