Reordered html/json handling in controller
Merge pull request #34 from wilchandler/json-html-bug

Reordered html/json handling in controller
Merge pull request #35 from wilchandler/styling-tuesday

Styling tuesday
Rendering homepage without layout (messes up sidebar)
Now rendering login page without error
Merge branch 'master' of https://github.com/wilchandler/exitslips into styling-tuesday
You can visit the homepage without blowing up.