Merge remote-tracking branch 'klokantech/master' into public_url

# Conflicts:
#	src/main.js
#	src/server.js

test/setup.js

@@ -18,5 +18,5 @@ before(function() {
 
 after(function() {
   console.log('global teardown');
-  global.server.close(function() { console.log('Done'); });
+  global.server.close(function() { console.log('Done'); process.exit(); });
 });