Merging in support for avatar uploads and Google Authenticator as a two factor auth device.