Include information on running jasmine-node.
Tidied up tests, export the Express app from our module.
Resolved merge conflicts.