Clean up controllers
Add pundit, routes and minor fixes
More pundit and some style changes?
Merge with tests