Pull out the custom users app and revert to default django users behavior. Also other random updates.