Merge branch 'master' into d3-testing

diff --cc lib/server/server.co
index 0d25d21,ef56d02..bf087a2
--- 1/lib/server/server.co
--- 2/lib/server/server.co
+++ b/lib/server/server.co
@@@ -15,10 -14,12 +14,12 @@@ Seq      = require 'seq
  yaml     = require 'js-yaml'
  mime     = require 'mime'
  express  = require 'express'
 -Resource = require 'express-resource'
 +# Resource = require 'express-resource'
  compiler = require 'connect-compiler-extras'
  
+ _        = require '../util/underscore'
  op       = require '../util/op'
+ files    = require './files'