WIP commit of massive refactor
Reformed PactGenerator, fixed model and consumer tests
Migrated pact-jvm-server to use the new stuff
Merge branch 'master' of https://github.com/DiUS/pact-jvm into service-refactor
Merging Travis' DSL changes into my model/consumer/server refactor

Conflicts:
	pact-jvm-consumer/src/main/java/au/com/dius/pact/consumer/AbstractConsumerPactTest.java
	pact-jvm-consumer/src/main/java/au/com/dius/pact/consumer/ConsumerInteractionJavaDsl.java
	pact-jvm-consumer/src/main/java/au/com/dius/pact/consumer/ConsumerPactJavaDsl.java
	pact-jvm-consumer/src/main/scala/au/com/dius/pact/consumer/ConsumerPact.scala
	pact-jvm-consumer/src/main/scala/au/com/dius/pact/consumer/MockProviderConfig.scala
	pact-jvm-consumer/src/main/scala/au/com/dius/pact/consumer/MockServiceProvider.scala
	pact-jvm-consumer/src/test/scala/au/com/dius/pact/consumer/ConsumerPactRunnerSpec.scala
	pact-jvm-consumer/src/test/scala/au/com/dius/pact/consumer/MockProviderSpec.scala
	pact-jvm-consumer/src/test/scala/au/com/dius/pact/consumer/PactServerConfigSpec.scala
	pact-jvm-model/src/main/scala/au/com/dius/pact/model/Matching.scala
	pact-jvm-model/src/main/scala/au/com/dius/pact/model/Pact.scala
	pact-jvm-server/src/main/scala/au/com/dius/pact/server/Server.scala
Integrated new PactFragment DSL with service refactoring
Merge branch 'master' of https://github.com/DiUS/pact-jvm into service-refactor
Merging the HeaderMatch additions from Travis

Conflicts:
	pact-jvm-model/src/main/scala/au/com/dius/pact/model/Matching.scala
	pact-jvm-model/src/main/scala/au/com/dius/pact/model/RequestMatching.scala
	pact-jvm-model/src/main/scala/au/com/dius/pact/model/ResponseMatching.scala
Merge pull request #38 from kenbot/service-refactor

Service refactor