diff --git a/akka-actors/src/main/scala/remote/Cluster.scala b/akka-actors/src/main/scala/remote/Cluster.scala
deleted file mode 100644
index 58be373b4b..0000000000
--- a/akka-actors/src/main/scala/remote/Cluster.scala
+++ /dev/null
@@ -1,218 +0,0 @@
-/**
- * Copyright (C) 2009 Scalable Solutions.
- */
-
-package se.scalablesolutions.akka.remote
-
-import org.jgroups.{JChannel, View, Address, Message, ExtendedMembershipListener, Receiver, SetStateEvent}
-import org.jgroups.util.Util
-
-import se.scalablesolutions.akka.Config.config
-import se.scalablesolutions.akka.util.Logging
-import se.scalablesolutions.akka.serialization.Serializer
-import se.scalablesolutions.akka.config.ScalaConfig._
-import se.scalablesolutions.akka.actor.{SupervisorFactory, Actor, ActorRegistry}
-import se.scalablesolutions.akka.remote.Cluster.{Node, RelayedMessage}
-
-import scala.collection.immutable.{Map, HashMap, HashSet}
-
-/**
- * Interface for interacting with the cluster.
- */
-trait Cluster {
-
-  def name: String
-
-  def registerLocalNode(hostname: String, port: Int): Unit
-
-  def deregisterLocalNode(hostname: String, port: Int): Unit
-
-  def relayMessage(to: Class[_ <: Actor], msg: AnyRef): Unit
-
-  def lookup[T](pf : PartialFunction[RemoteAddress,T]) : Option[T]
-}
-
-/**
- * Baseclass for cluster implementations
- */
-abstract class ClusterActor extends Actor with Cluster {
-  val name = config.getString("akka.remote.cluster.name") getOrElse "default"
-}
-
-/**
- * A singleton representing the Cluster
- * Loads a specified ClusterActor and delegates to that instance
- */
-object Cluster extends Cluster {
-  case class Node(endpoints: List[RemoteAddress])
-  case class RelayedMessage(actorClassFQN:String, msg: AnyRef)
-
-  lazy val impl: Option[ClusterActor] = {
-    config.getString("akka.remote.cluster.actor") map (name => {
-      val actor = Class.forName(name)
-                       .newInstance
-                       .asInstanceOf[ClusterActor]
-
-      SupervisorFactory(
-        SupervisorConfig(
-          RestartStrategy(OneForOne, 3, 100, List(classOf[Exception])),
-          Supervise(actor, LifeCycle(Permanent)) :: Nil
-          )
-        ).newInstance.start
-
-      actor
-    })
-  }
-
-  def name = impl.map(_.name).getOrElse("No cluster")
-
-  def lookup[T](pf : PartialFunction[RemoteAddress,T]) : Option[T] = impl.flatMap(_.lookup(pf))
-
-  def registerLocalNode(hostname: String, port: Int): Unit = impl.map(_.registerLocalNode(hostname, port))
-
-  def deregisterLocalNode(hostname: String, port: Int): Unit = impl.map(_.deregisterLocalNode(hostname, port))
-
-  def relayMessage(to: Class[_ <: Actor], msg: AnyRef): Unit = impl.map(_.relayMessage(to, msg))
-}
-
-/**
- * Just a placeholder for the JGroupsClusterActor message types
- */
-object JGroupsClusterActor {
-  //Message types
-  sealed trait ClusterMessage
-  case object PapersPlease extends ClusterMessage
-  case class Papers(addresses: List[RemoteAddress]) extends ClusterMessage
-  case object Block extends ClusterMessage
-  case object Unblock extends ClusterMessage
-  case class Zombie(address: Address) extends ClusterMessage
-  case class RegisterLocalNode(server: RemoteAddress) extends ClusterMessage
-  case class DeregisterLocalNode(server: RemoteAddress) extends ClusterMessage
-}
-
-/**
- * Clustering support via JGroups
- */
-class JGroupsClusterActor extends ClusterActor {
-  import JGroupsClusterActor._
-  import org.scala_tools.javautils.Implicits._
-
-  @volatile private var local: Node = Node(Nil)
-  @volatile private var channel: Option[JChannel] = None
-  @volatile private var remotes: Map[Address, Node] = Map()
-
-  override def init = {
-    log debug "Initiating cluster actor"
-    remotes = new HashMap[Address, Node]
-    val me = this
-    //Set up the JGroups local endpoint
-    channel = Some(new JChannel {
-      setReceiver(new Receiver with ExtendedMembershipListener {
-        def getState: Array[Byte] = null
-
-        def setState(state: Array[Byte]): Unit = ()
-
-        def receive(msg: Message): Unit = me send msg
-
-        def viewAccepted(view: View): Unit = me send view
-
-        def suspect(a: Address): Unit = me send Zombie(a)
-
-        def block: Unit = me send Block
-
-        def unblock: Unit = me send Unblock
-      })
-    })
-    channel.map(_.connect(name))
-  }
-
-  protected def serializer = Serializer.Java //FIXME make this configurable
-
-  def lookup[T](pf : PartialFunction[RemoteAddress,T]) : Option[T] = remotes.values.toList.flatMap(_.endpoints).find(pf isDefinedAt _).map(pf)
-
-  def registerLocalNode(hostname: String, port: Int): Unit = this send RegisterLocalNode(RemoteAddress(hostname, port))
-
-  def deregisterLocalNode(hostname: String, port: Int): Unit = this send DeregisterLocalNode(RemoteAddress(hostname, port))
-
-  def relayMessage(to: Class[_ <: Actor], msg: AnyRef): Unit = this send RelayedMessage(to.getName, msg)
-
-  private def broadcast[T <: AnyRef](recipients: Iterable[Address], msg: T): Unit = {
-    lazy val m = serializer out msg
-    for (c <- channel; r <- recipients) c.send(new Message(r, null, m))
-
-  }
-
-  private def broadcast[T <: AnyRef](msg: T): Unit = {
-    if(!remotes.isEmpty) //Don't broadcast if we are not connected anywhere...
-      channel.map(_.send(new Message(null, null, serializer out msg)))
-  }
-
-  def receive = {
-    case Zombie(x) => { //Ask the presumed zombie for papers and prematurely treat it as dead
-      log debug ("Zombie: %s", x)
-      broadcast(x :: Nil, PapersPlease)
-      remotes = remotes - x
-    }
-
-    case v: View => {
-      //Not present in the cluster anymore = presumably zombies
-      //Nodes we have no prior knowledge existed = unknowns
-      val members = Set[Address]() ++ v.getMembers.asScala - channel.get.getAddress //Exclude ourselves
-      val zombies = Set[Address]() ++ remotes.keySet -- members
-      val unknown = members -- remotes.keySet
-
-      log debug v.printDetails
-
-      //Tell the zombies and unknowns to provide papers and prematurely treat the zombies as dead
-      broadcast(zombies ++ unknown, PapersPlease)
-      remotes = remotes -- zombies
-    }
-
-    case m: Message => {
-      if (m.getSrc != channel.map(_.getAddress).getOrElse(m.getSrc)) //handle non-own messages only, and only if we're connected
-        (serializer in (m.getRawBuffer, None)) match {
-          
-          case PapersPlease => {
-            log debug ("Asked for papers by %s", m.getSrc)
-            broadcast(m.getSrc :: Nil, Papers(local.endpoints))
-            
-            if(remotes.get(m.getSrc).isEmpty)  //If we were asked for papers from someone we don't know, ask them!
-              broadcast(m.getSrc :: Nil, PapersPlease)
-          }
-
-          case Papers(x)            => remotes = remotes + (m.getSrc -> Node(x))
-
-          case RelayedMessage(c, m) => ActorRegistry.actorsFor(c).map(_ send m)
-            
-          case unknown              => log debug ("Unknown message: %s", unknown.toString)
-        }
-    }
-
-    case rm @ RelayedMessage(_,_) => {
-      log debug ("Relaying message: %s", rm)
-      broadcast(rm)
-    }
-
-    case RegisterLocalNode(s) => {
-      log debug ("RegisterLocalNode: %s", s)
-      local = Node(local.endpoints + s)
-      broadcast(Papers(local.endpoints))
-    }
-
-    case DeregisterLocalNode(s) => {
-      log debug ("DeregisterLocalNode: %s", s)
-      local = Node(local.endpoints - s)
-      broadcast(Papers(local.endpoints))
-    }
-
-    case Block => log debug "UNSUPPORTED: block" //TODO HotSwap to a buffering body
-    case Unblock => log debug "UNSUPPORTED: unblock" //TODO HotSwap back and flush the buffer
-  }
-
-  override def shutdown = {
-    log debug ("Shutting down %s", this.getClass.getName)
-    channel.map(_.shutdown)
-    remotes = Map()
-    channel = None
-  }
-}
\ No newline at end of file
diff --git a/akka-core/pom.xml b/akka-core/pom.xml
index b928182607..c3bf03e79c 100644
--- a/akka-core/pom.xml
+++ b/akka-core/pom.xml
@@ -45,12 +45,12 @@
     <dependency>
       <groupId>org.multiverse</groupId>
       <artifactId>multiverse-core</artifactId>
-      <version>0.3-SNAPSHOT</version>
+      <version>0.3</version>
     </dependency>
     <dependency>
       <groupId>org.multiverse</groupId>
       <artifactId>multiverse-alpha</artifactId>
-      <version>0.3-SNAPSHOT</version>
+      <version>0.3</version>
     </dependency>
     <dependency>
       <groupId>net.lag</groupId>
@@ -60,7 +60,7 @@
     <dependency>
       <groupId>org.jboss.netty</groupId>
       <artifactId>netty</artifactId>
-      <version>3.2.0.ALPHA1</version>
+      <version>3.2.0.ALPHA2</version>
     </dependency>
     <dependency>
       <groupId>org.scala-tools</groupId>
@@ -100,14 +100,14 @@
       <version>0.3</version>
     </dependency>
     <dependency>
-      <groupId>dispatch.json</groupId>
-      <artifactId>dispatch-json</artifactId>
-      <version>0.5.2</version>
+      <groupId>net.databinder</groupId>
+      <artifactId>dispatch-json_2.7.7</artifactId>
+      <version>0.6.4</version>
     </dependency>
     <dependency>
-      <groupId>dispatch.http</groupId>
-      <artifactId>dispatch-http</artifactId>
-      <version>0.5.2</version>
+      <groupId>net.databinder</groupId>
+      <artifactId>dispatch-http_2.7.7</artifactId>
+      <version>0.6.4</version>
     </dependency>
     <dependency>
       <groupId>sjson.json</groupId>
diff --git a/akka.iml b/akka.iml
index 87e527b00d..c418d66936 100644
--- a/akka.iml
+++ b/akka.iml
@@ -3,7 +3,6 @@
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
-    <exclude-output />
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
diff --git a/pom.xml b/pom.xml
index 4ab3b9ac74..07647bb6d1 100755
--- a/pom.xml
+++ b/pom.xml
@@ -227,6 +227,14 @@
         <enabled>false</enabled>
       </snapshots>
     </repository>
+    <repository>
+      <id>databinder.net/repo/</id>
+      <name>dbDispatch Repository for Maven</name>
+      <url>http://databinder.net/repo</url>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+    </repository>
   </repositories>
 
   <pluginRepositories>