Refactor display logic.

Avoid passing around the query processor when it just needs the URL.
Fix theme name and implement bookmark display.
Add collection view.
Strip some debug stuff I accidentally left in...

... Oops!
Attempt to match the schema provided in terms of the number of values.
Avoid calling bookmark functions directly.
Reroute bookmark path.
Merge pull request #6 from adam-vessey/7.x-CWRCPS-16

CWRCPS-16: Collection and bookmark views