comment out oauth Twitter tokens
fix merge
revert index
revert user