Update code to work with lastest node and express

Works as at 21/04/14