AHA! Thanks to Anne, Rao, and Phil for assitance on this one test.
Merge branch 'master' into melanie_controller_tests
Merge pull request #6 from golden-bears-2014/melanie_controller_tests

Melanie controller tests