Remove version locks on json and bundler gems
Add Rake tasks for unit and integration tests separately
Implement a Query helper object