Adding in test for when the controller is null (in the case of Emails)
Merge branch 'master' of git://github.com/harisenbon/TwigView