Resolves a conflict between OA Users and Panopoly Users.
Merge pull request #7 from scottalan/conflict-with-panopoly_users

Resolves a conflict between OA Users and Panopoly Users.