integrate twitter omniauth
fix merge conflict in seeds file