Last fixes from Cory's recommendations.

Removed cruft from users controller, checked in clean schema file, updated criteria controller scope.