A bit of card_controller cleanup
Merge branch 'simple_stuff' into action_events