Added namespacing for easier testing in controller.
Merge branch 'master' of https://github.com/joshuagordon/hackflix_summer_2013