Switched to bookshelf.js
Merge branch 'switch-to-bookshelf'