Server and app are now separate enough that we need to provide them both to nowjs
Merge branch 'master' of https://github.com/jvogt/now