Merge branch 'master-tom'

Conflicts:
	docs/source/getting-started.rst
	src/main/java/com/github/tomakehurst/wiremock/WireMockServer.java
	src/main/java/com/github/tomakehurst/wiremock/client/HttpAdminClient.java
	src/main/java/com/github/tomakehurst/wiremock/client/ResponseDefinitionBuilder.java
	src/main/java/com/github/tomakehurst/wiremock/client/ValueMatchingStrategy.java
	src/main/java/com/github/tomakehurst/wiremock/client/WireMock.java
	src/main/java/com/github/tomakehurst/wiremock/core/Options.java
	src/main/java/com/github/tomakehurst/wiremock/core/WireMockApp.java
	src/main/java/com/github/tomakehurst/wiremock/core/WireMockConfiguration.java
	src/main/java/com/github/tomakehurst/wiremock/http/AdminRequestHandler.java
	src/main/java/com/github/tomakehurst/wiremock/http/ResponseDefinition.java
	src/main/java/com/github/tomakehurst/wiremock/matching/RequestPattern.java
	src/main/java/com/github/tomakehurst/wiremock/matching/ValuePattern.java
	src/main/java/com/github/tomakehurst/wiremock/servlet/WireMockWebContextListener.java
	src/main/java/com/github/tomakehurst/wiremock/standalone/CommandLineOptions.java
	src/main/java/com/github/tomakehurst/wiremock/stubbing/InMemoryStubMappings.java
	src/main/java/com/github/tomakehurst/wiremock/verification/journal/RequestJournal.java
	src/test/java/com/github/tomakehurst/wiremock/stubbing/ValuePatternTest.java