Refactor common spec stubing into make_Current_user_admin helper method
Use make_current_user_admin helper method
DRY out making current user nonadmin
More drying out of admin as current user
Resolve merge conflict with upstream develop
Merge pull request #195 from mtc2013/spec_refactor

Spec refactor