6 commits

Author	SHA1	Message	Date
Tim Griesser	724592ec5f	cleaning up args, allowing opts to be passed to the various bookshelf calls	2013-05-26 20:04:22 -04:00
ErisDS	e23381d17b	Fixing JSLint and the Mocha api tests	2013-05-26 20:25:17 +01:00
Tim Griesser	52911c7a50	more consistent use of promises	2013-05-26 13:44:01 -04:00
Jacob Gable	05ca58951b	Merge changes from upstream	2013-05-25 11:55:23 -05:00
Jacob Gable	601e261439	Fixing tests and adding settings provider.	2013-05-25 11:48:15 -05:00
Jacob Gable	242367e228	Bookshelf provider abstraction and tests	2013-05-23 23:02:41 -05:00