diff --git a/devtools.html b/devtools.html
new file mode 100644
index 0000000000000000000000000000000000000000..7b096da4e67d53a9dd94cd27a2b7abb113a93848
--- /dev/null
+++ b/devtools.html
@@ -0,0 +1,12 @@
+<html>
+    <body>
+        <h1>Development Tools</h1>
+        <ul>
+            <li><a href="/apc/index.php?OB=1">APC</a></li>
+            <li><a href="/elasticsearch/_plugin/head">ElasticSearch</a></li>
+            <li><a href="/hhvm">HHVM</a></li>
+            <li><a href="/phpci/public/">PHPCI</a></li>
+            <li><a href="/phpma/index.php">phpMyAdmin</a></li>
+        </ul>
+    </body>
+</html>
diff --git a/devtools.nginx.conf b/devtools.nginx.conf
index 8121ba06e95a0ebf0af71ff249d19dd9b86939b6..cb29536f64de692fac5b237107d48e8620afb7c0 100644
--- a/devtools.nginx.conf
+++ b/devtools.nginx.conf
@@ -9,6 +9,10 @@ server {
         autoindex on;
     }
 
+    location /elasticsearch/console {
+        proxy_pass http://127.0.0.1:9200/;
+    }
+
     location /phpma {
         index index.php;
         try_files $uri /phma/index.php?$is_args$args;
@@ -23,7 +27,6 @@ server {
     access_log off;
 
     location ~ \.php {
-        fastcgi_index index.php;
         fastcgi_pass hhvmfcgi;
         fastcgi_buffers 256 4k;
         include fastcgi_params;
diff --git a/hhvm.service b/hhvm.service
index 619f06da66cab75005416fc78efdef9d14dd917c..8b295cc2ad38bc4a7cf9e4ad6cf4c9c5c618c8c8 100644
--- a/hhvm.service
+++ b/hhvm.service
@@ -5,6 +5,7 @@ Description=HHVM HipHop Virtual Machine (FCGI)
 ExecStartPre=/bin/mkdir -p /var/run/hhvm
 ExecStartPre=/bin/chown -R gliders:nginx /var/run/hhvm
 ExecStart=/usr/local/bin/hhvm --user gliders --mode daemon -d hhvm.server.type=fastcgi -d hhvm.server.file_socket=/var/run/hhvm/sock -d hhvm.admin_server.port=9001 -d hhvm.admin_server.password=gliders9876
+Restart=on-failure
 
 [Install]
 WantedBy=multi-user.target