Merge pull request #20 from Oregu/master

Had a lot of fun debugging on nodester (wait)
needless import in app.coffee
Merge remote-tracking branch 'upstream/master'
Compute delta time on server