Trying to move everything to the controller + rubocop
Merge branch 'master' into cleanup-reporting
Moving stuff to haml...
Merge branch 'staging' into cleanup-reporting
Fixing up the views a bit
Rubocop cleanup