Fix the T4MVC errors I introduced.

I was doing merges yesterday on my laptop, which doesn't play nicely with the T4MVC bits at all. This commit resolves the issues I inadvertantly introduced, and all the issues @adrianbanks raised yesterday *except* the admin area issue (#96).