Bumping to Knex 0.6.12, Bookshelf 0.7.1
Merge pull request #2932 from tgriesser/knex-bookshelf-update

Bumping to Knex 0.6.12, Bookshelf 0.7.1