Refactor authorize_actions_for and authority_actions to be consistent

Decouples dealing with the :actions and :all_actions options.
Previously, overridden_actions was being applied twice to the same hash
resulting in unexpected behavior.