What will rebasing do? The links go to the current PR, the links work for me.  

Although I changed a lot so maybe everything needs a look, but the two relevant links went to:

 The avatar fix begins L304 in app/helpers/application_helper.rb
 Updating attributes begins L118 in  app/models/user.rb

Updating attributes probably needs to change should maybe only select firstname/email/lastname instead of using except?
It looks like there was some talk about this in #986 -- since my code is specific only to ldap, maybe I'm stepping on toes there.