Adding test coverage via grunt mocha
Merge branch 'master' into bookshelf
Merge branch 'bookshelf' into bookshelf-express