Shadi helped with some doubles...still not completely working though.
Correctly stubbed out auth hash to test create action in users_controller.
merging master onto local branch to fix any conflicts
before pushing local branch to master
Merge branch 'master' of https://github.com/fox-squirrels-2013/orphan-crazy-eyes into add_more_controller_tests
Merge pull request #25 from fox-squirrels-2013/add_more_controller_tests

Add more controller tests