Check both 'ng-model' and 'data-ng-model' attributes in callbacks.update

Once more with feeling (and just the necessary commits). See #294 and #293.