added taskrabbit omniauth
resolved conflicts?