Updated to match newer CakePHP conventions

Parameters for callback functions were changed to prevent PHP STRICT messages.
Uses $Model instead of $model.