Adding source map support to tests
Merge branch 'master' into bookshelf
Merge branch 'bookshelf' of https://github.com/winton/node-template into bookshelf