Merge branch 'master' of github.com:aphyr/riemann-dash

Conflicts:
	lib/riemann/dash/public/views/help.js

lib/riemann/dash/public/views/help.js

@@ -6,6 +6,7 @@
       this.el.append('<div class="box">' +
         "<p>Welcome to Riemann-Dash.</p>" +
         "<p>Need a refresher on the query language? See the <a href=\"https://github.com/aphyr/riemann/blob/master/test/riemann/query_test.clj\">query tests</a> for examples, or read the <a href=\"https://github.com/aphyr/riemann/blob/master/resources/query.g4\">spec</a>.</p>" +
+        "<p>Double-click a workspace to rename it.</p>" +
         "<p>Press <b>Control/Meta+click</b>  to select a view. Escape unfocuses. Use the arrow keys to move a view. Use Control+arrow to <i>split</i> a view in the given direction.</p>" +
         "<p>To edit a view, hit e. Use enter, or click 'apply', to apply your changes. Escape cancels.</p>" +
         "<p>To save your changes to the server, press s. To display the configuration, press c.</p>" +