[fix bug 917960] Use remove 'www' from github.com and twitter.com

Also fixes nits.