twitter auth works

Merging Nick work back into Master