Make .json optional for /organisations
Include JSON gem in bundle

MultiJson was giving warnings that we were using the
system JSON gem, and that it should be included in the
bundle
Consistent quoting
Merge branch 'master' into query-analysis

Conflicts:
	Gemfile