code corrections and cleanup for 2.1
@see ticket http://cakephp.lighthouseapp.com/projects/42648/tickets/2128-inconsistency-in-object-variable-names
type hinting controllers and views
type hinting models
fix broken test
I'm going to read through this tonight and hopefully merge it in.
These changes were merged in [7665f36].