diff --git a/akka-core/.ensime b/akka-core/.ensime
new file mode 100644
index 0000000000..15e1ae85be
--- /dev/null
+++ b/akka-core/.ensime
@@ -0,0 +1,79 @@
+(
+
+ ;; Where you unpacked the ENSIME distribution.
+ :server-root "/home/jboner/emacs-config/lib/ensime"
+
+ ;; The command with which to invoke the ENSIME server. Change this to 
+ ;; "bin/server.bat" if your're on Windows.
+ :server-cmd  "bin/server.bat"
+
+
+ ;; The host to connect to. Connecting to remote ENSIME servers is not
+ ;; currently supported.
+ ;; ------------------------------
+ ;; :server-host "localhost"
+
+
+ ;; Assume a standard sbt directory structure. Look in default sbt
+ ;; locations for dependencies, sources, target, etc. 
+ ;; 
+ ;; Note for sbt subprojects: Each subproject needs it's own .ensime
+ ;; file.
+ ;; -----------------------------
+ :use-sbt t
+ :sbt-compile-conf "compile"
+
+
+ ;; Use an existing pom.xml to determine the dependencies
+ ;; for the project. A Maven-style directory structure is assumed.
+ ;; -----------------------------
+ ;; :use-maven t
+ ;; :maven-compile-scopes "compile"
+ ;; :maven-runtime-scopes "runtime"
+
+
+ ;; Use an existing ivy.xml to determine the dependencies
+ ;; for the project. A Maven-style directory structure is assumed.
+ ;; -----------------------------
+ ;; :use-ivy t
+ ;; :ivy-compile-conf "compile"
+ ;; :ivy-runtime-conf "compile"
+
+
+ ;; The home package for your project. 
+ ;; Used by ENSIME to populate the project outline view.
+ ;; ------------------------------
+ :project-package "se.scalablesolutions.akka"
+
+
+ ;; :sources ([dir | file]*)
+ ;; Include source files by directory(recursively) or by filename.
+ ;; ------------------------------
+ :sources ("src/main/")
+
+
+ ;; :dependency-jars ([dir | file]*)
+ ;; Include jars by directory(recursively) or by filename.
+ ;; ------------------------------
+ ;; :dependency-jars ("lib")
+
+
+ ;; :dependency-dirs ([dir | file]*)
+ ;; Include directories of .class files.
+ ;; ------------------------------
+ ;; :dependency-dirs ("target/classes")
+
+
+ ;; :target dir
+ ;; Specify the target of the project build process. Should be 
+ ;; the directory where .class files are written
+ ;; 
+ ;; The target is used to populate the classpath when launching
+ ;; the inferior scala repl.
+ ;; ------------------------------
+ ;; :target "target/classes"
+
+ )
+
+
+
diff --git a/akka-core/src/main/scala/actor/ActorRef.scala b/akka-core/src/main/scala/actor/ActorRef.scala
index d1684bdd2b..8b834b1b7c 100644
--- a/akka-core/src/main/scala/actor/ActorRef.scala
+++ b/akka-core/src/main/scala/actor/ActorRef.scala
@@ -402,13 +402,13 @@ trait ActorRef extends TransactionManagement {
    * Returns the home address and port for this actor.
    */
   def homeAddress: InetSocketAddress = _homeAddress
-
+  
   /**
    * Set the home address and port for this actor.
    */
   def homeAddress_=(hostnameAndPort: Tuple2[String, Int]): Unit =
     homeAddress_=(new InetSocketAddress(hostnameAndPort._1, hostnameAndPort._2))
-
+    
   /**
    * Set the home address and port for this actor.
    */
@@ -529,7 +529,7 @@ trait ActorRef extends TransactionManagement {
   protected[akka] def supervisor_=(sup: Option[ActorRef]): Unit
 
   protected[akka] def mailbox: Deque[MessageInvocation]
-
+  
   protected[akka] def restart(reason: Throwable): Unit
 
   protected[akka] def handleTrapExit(dead: ActorRef, reason: Throwable): Unit
@@ -589,8 +589,7 @@ sealed class LocalActorRef private[akka](
           __format.asInstanceOf[SerializerBasedActorFormat[_]]
                   .serializer
                   .fromBinary(__actorBytes, Some(actorClass)).asInstanceOf[Actor]
-        else
-          actorClass.newInstance.asInstanceOf[Actor]
+        else actorClass.newInstance.asInstanceOf[Actor]
       })
       loader = Some(__loader)
       isDeserialized = true
diff --git a/akka-core/src/main/scala/actor/ActorRegistry.scala b/akka-core/src/main/scala/actor/ActorRegistry.scala
index fea1b3b01c..20855c18d5 100644
--- a/akka-core/src/main/scala/actor/ActorRegistry.scala
+++ b/akka-core/src/main/scala/actor/ActorRegistry.scala
@@ -36,9 +36,7 @@ object ActorRegistry extends ListenerManagement {
   /**
    * Returns all actors in the system.
    */
-  def actors: List[ActorRef] = {
-	filter(_=> true)
-  }
+  def actors: List[ActorRef] = filter(_ => true)
 
   /**
    * Invokes a function for all actors.
@@ -52,7 +50,7 @@ object ActorRegistry extends ListenerManagement {
    * Finds all actors that are subtypes of the class passed in as the Manifest argument and supproting passed message.
    */
   def actorsFor[T <: Actor](message: Any)(implicit manifest: Manifest[T] ): List[ActorRef] =
-	 filter(a => manifest.erasure.isAssignableFrom(a.actor.getClass) && a.isDefinedAt(message))
+    filter(a => manifest.erasure.isAssignableFrom(a.actor.getClass) && a.isDefinedAt(message))
 
   /**
    * Finds all actors that satisfy a predicate.
@@ -73,7 +71,7 @@ object ActorRegistry extends ListenerManagement {
    * Finds all actors that are subtypes of the class passed in as the Manifest argument.
    */
   def actorsFor[T <: Actor](implicit manifest: Manifest[T]): List[ActorRef] =
-	  filter(a => manifest.erasure.isAssignableFrom(a.actor.getClass))
+    filter(a => manifest.erasure.isAssignableFrom(a.actor.getClass))
 
   /**
    * Finds any actor that matches T.