Make default admin filter scoped to org only

This removes the previous role-specific functionality and replaces it
with a single piece of logic that defaults to all active documents in
the user's organisation.

https://www.pivotaltracker.com/story/show/56207006
Don't use define_method with static method names and don't define methods in 'included' block unless necessary.
Merge pull request #845 from alphagov/default-admin-filters

https://www.pivotaltracker.com/story/show/56207006

Make default admin filter scoped to org only
Merge pull request #858 from alphagov/change_strange_method_definitions_in_edition_concerns

Changes some methods defined with 'define_method' in Edition concerns to be normal module methods.
Fix broken build

Without an explicit state set the params were being incorrectly merged
and continuously redirected, which broke Cucumber (and probably the website).
Try fixing tests again (sorry)