Make {Create,Response,Update}Message greppable
Backfill specs for model_controller
Backfill tests for ModelController
Remove what appears to be mistake code
Call {before,after}_update from update
Auto-merge remote-tracking branch 'upstream/master'