Permissions can now set how Group/Team permissions will be combined and set 'All' as the default seperately.

This makes the flags I added in my latest commit to oa_workbench_access actually work:

http://cgit.drupalcode.org/oa_workbench/commit/?id=15a3901a71d39a8ccfdbe90f055434d5bd674114

However, I still need to finish updating all the tests for these changes!