Tweaks to get the cucumber tests passing.

bin/gvm

@@ -14,7 +14,7 @@ function help {
 }
 
 if [ -f "$HOME/.gvmtest" ]; then
-	GVM_SERVICE="http://localhost:8080/gvm-service"
+	GVM_SERVICE="http://localhost:8080"
 fi
 
 if [ ! -d "$GVM_DIR" ]; then

src/test/cucumber/gvm/command_line_interop.feature

@@ -3,6 +3,7 @@ Feature: Command Line Interop
 	Background:
 		Given an initialised system
 
+	@webservice
 	Scenario: Enter gvm
 		When I enter "gvm"
 		Then I see "Usage: gvm <command> <candidate> [version]"

src/test/resources/gvm/env.groovy

@@ -24,7 +24,3 @@ private cleanUp(){
 Before("@webservice"){
 	def server = startServer()
 }
-
-//After("@webservice"){
-//	stopServer(server)
-//}

src/test/resources/gvm/installation_steps.groovy

@@ -6,7 +6,7 @@ home = System.getProperty('user.home')
 gvmDir = new File("${home}/.gvm")    
 
 Given(~'^the default "([^"]*)" candidate is "([^"]*)"$') { String candidate, String version ->
-	def candidateVersion = new URL("http://localhost:8080/gvm-service/${candidate}/version").text
+	def candidateVersion = new URL("http://localhost:8080/${candidate}/version").text
 	assert candidateVersion == version
 }