No more Twitter (again)

The old Twitter link was incorrectly merged back in at some point.
Merge branch 'master' into gh-pages