Clean up Controller mixin

Fixes aptible/dashboard.aptible.com#62
Rubocop fixes