controller cleanup
Merge branch 'master' of github.com:Derikulous/adventure_time