Collapse twintegration branch into master.

There's not really too much point having a separate Twitter branch now. We've got basic Twitter integration, we just need to enhance it.