diff --git a/.gitignore b/.gitignore
index 25d3fa2323..7d8723dcb9 100755
--- a/.gitignore
+++ b/.gitignore
@@ -24,8 +24,7 @@ logs
 .#*
 .codefellow
 storage
-.codefellow
-.ensime
+.ensime*
 _dump
 .manager
 manifest.mf
diff --git a/akka-cluster/src/main/scala/akka/cluster/ClusterSettings.scala b/akka-cluster/src/main/scala/akka/cluster/ClusterSettings.scala
index 10f0316476..e05c04b9d7 100644
--- a/akka-cluster/src/main/scala/akka/cluster/ClusterSettings.scala
+++ b/akka-cluster/src/main/scala/akka/cluster/ClusterSettings.scala
@@ -16,8 +16,8 @@ class ClusterSettings(val config: Config, val systemName: String) {
   val FailureDetectorThreshold = getInt("akka.cluster.failure-detector.threshold")
   val FailureDetectorMaxSampleSize = getInt("akka.cluster.failure-detector.max-sample-size")
   val NodeToJoin: Option[Address] = getString("akka.cluster.node-to-join") match {
-    case ""                     ⇒ None
-    case AddressExtractor(addr) ⇒ Some(addr)
+    case ""                         ⇒ None
+    case AddressFromURIString(addr) ⇒ Some(addr)
   }
   val GossipInitialDelay = Duration(getMilliseconds("akka.cluster.gossip.initialDelay"), MILLISECONDS)
   val GossipFrequency = Duration(getMilliseconds("akka.cluster.gossip.frequency"), MILLISECONDS)