Merge omniauth into Master, fix conflicts.