getting ready to merge the omniauth bits