Merge pull request #94 from astopy/master

Fix Docker build.
first attempt at adding stubbed cellect/zookeeper to panoptes functional testing
stub cellect client connections for all controller specs
use new rspec syntax
Update workflow controller and spec for new cellect calling style
Update classification controller and spec
Add whitelisted params. Still fails
updated cellect client
double instead of an instance_double for Cellect::Client.connection
use latest doorkeeper code

Ed's PR's have been accepted, now just waiting on the gem version bump.
Merge pull request #98 from camallen/update_doorkeeper

use latest doorkeeper code
api response content_type should be application/json

Our server requires the http_accept header with our custom api mime type but the response content_type header should be application/json and understandable to any client.
return json response for missing routes
Revert "api response content_type should be application/json"

This reverts commit 8f3a76304bc6efd72effa9ba0f4018453be46819.

JSON API response should reflect the requested HTTP_ACCEPT header.
use normal JSON content types for non-API routes
remove duplicate RecordNotFound rescue
allow ProjectSerializer to gracefully handle empty project_contents association
Merge pull request #99 from camallen/nil_project_contents

allow ProjectSerializer to gracefully handle empty project_contents
add owner and display_name filters for projects#index action
Merge branch 'fix_api_reponse' from pull request #91