Some ng-animate tweaks.

Still need to guard against $animator not being defined. Also avoid
having two variables 'doAnimate' in scope to make the code clearer.