Merge pull request #17 from fleur/master

added wireframe pdf, hardcoded /api/dish and /api/dishes GET metho...
added config.js for bookshelf, knex, and sqlite db
Merge pull request #18 from BrandonMcNary/master

added config.js for bookshelf, knex, and sqlite db
merging in en/en so the travis CI pull request will work.  hopefully.  the package.json file had changes that hadn't been merged yet