diff --git a/.gitignore b/.gitignore
index cc43a147..635255b3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,5 +23,5 @@ classes
 
 *.log*
 obj
-
+*.swp
 .DS_Store
diff --git a/examples/src/main/assembly/files/blueprints/docker-cloud.yaml b/examples/src/main/assembly/files/blueprints/docker-cloud.yaml
index dfaa6429..57d77978 100644
--- a/examples/src/main/assembly/files/blueprints/docker-cloud.yaml
+++ b/examples/src/main/assembly/files/blueprints/docker-cloud.yaml
@@ -22,17 +22,16 @@ services:
     install.version: "1.2"
     entity.dynamicLocation.name: "my-docker-cloud"
     docker.host.securityGroup: "docker"
-    docker.host.cluster.initial.size: 1
+    docker.host.cluster.initial.size: 2
     docker.host.register: false
     docker.policy.ha.enable: true
     docker.host.flags:
-      minRam: 3000
-      minCores: 2
+      minRam: 8000
     docker.container.strategies:
     - $brooklyn:object:
         type: "brooklyn.location.docker.strategy.BreadthFirstPlacementStrategy"
         brooklyn.config:
-          maxContainers: 16
+          maxContainers: 8
     - $brooklyn:object:
         type: "brooklyn.location.docker.strategy.CpuUsagePlacementStrategy"
         brooklyn.config:
diff --git a/examples/src/main/assembly/files/blueprints/riak-webapp-cluster.yaml b/examples/src/main/assembly/files/blueprints/riak-webapp-cluster.yaml
new file mode 100644
index 00000000..59a616d6
--- /dev/null
+++ b/examples/src/main/assembly/files/blueprints/riak-webapp-cluster.yaml
@@ -0,0 +1,39 @@
+# Copyright 2014 by Cloudsoft Corporation Limited
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+id: riak-webapp-cluster
+name: Riak Cluster with Webapp Cluster
+locations:
+- my-docker-cloud
+origin: "https://github.com/apache/incubator-brooklyn/"
+services:
+- type: brooklyn.entity.nosql.riak.RiakCluster
+  initialSize: 5
+  id: cluster
+  brooklyn.config:
+    install.version: 2.0.0
+- type: brooklyn.entity.webapp.ControlledDynamicWebAppCluster
+  name: Web Cluster
+  brooklyn.config:
+    initialSize: 3
+    controlleddynamicwebappcluster.controllerSpec:
+      $brooklyn:entitySpec:
+        type: brooklyn.entity.proxy.nginx.NginxController
+        brooklyn.config:
+          member.sensor.hostname: "host.subnet.hostname"
+    wars.root:
+      "https://s3-eu-west-1.amazonaws.com/brooklyn-clocker/brooklyn-example-hello-world-sql-webapp.war"
+    java.sysprops: 
+      brooklyn.example.riak.nodes:
+        $brooklyn:component("cluster").attributeWhenReady("riak.cluster.nodeList")