Fix various problems with running on developer Ubuntu mach9ine

build.sbt

@@ -32,7 +32,7 @@ val scalaUri = "com.netaporter" %% "scala-uri" % "0.4.6"
 val scalaz = "org.scalaz" %% "scalaz-core" % "7.1.1"
 val membershipCommon = "com.gu" %% "membership-common" % "0.225"
 val sentryRavenLogback = "com.getsentry.raven" % "raven-logback" % "7.2.3"
-val memsubCommonPlayAuth = "com.gu" %% "memsub-common-play-auth" % "0.7"
+val memsubCommonPlayAuth = "com.gu" %% "memsub-common-play-auth" % "1.0"
 libraryDependencies ++= Seq(
   cache,
   ws,
@@ -51,7 +51,7 @@ dependencyOverrides += "com.typesafe.play" %% "play-json" % "2.4.6"
 
 resolvers += "scalaz-bintray" at "http://dl.bintray.com/scalaz/releases"
 
-addCommandAlias("devrun", "run -Dconfig.resource=dev.conf 9111")
+addCommandAlias("devrun", "run -Dconfig.resource=DEV.conf 9111")
 
 import com.typesafe.sbt.packager.archetypes.ServerLoader.Systemd
 serverLoading in Debian := Systemd
@@ -76,6 +76,6 @@ javaOptions in Universal ++= Seq(
     "-J-XX:MaxMetaspaceSize=500m",
     "-J-XX:+PrintGCDetails",
     "-J-XX:+PrintGCDateStamps",
-    " -Dconfig.resource=prod.conf",
+    " -Dconfig.resource=PROD.conf",
     s"-J-Xloggc:/var/log/${packageName.value}/gc.log"
 )

conf/dev.conf → conf/DEV.conf

@@ -10,7 +10,7 @@
 # experimenting, don't commit those changes. You may want to use this Git
 # command to avoid accidentally committing noise:
 #
-# git update-index --assume-unchanged conf/dev.conf
+# git update-index --assume-unchanged conf/DEV.conf
 #
 # (see http://stackoverflow.com/a/11366713/438886 for more details)
 

conf/application.conf

@@ -1,9 +1,6 @@
 play.application.loader = "wiring.AppLoader"
 
 
-# Config for the 'Vanilla' Membership site
-include "copy"
-
 play.http.session.secure=true
 
 play.http.errorHandler = "monitoring.ErrorHandler"