Replicate rv 544846566 by Amorymeltzer: Change 'e-mail' to 'email', for consistency
Revert "warn: group warnings into categories; add and remove some warnings"

This reverts commit 7ef43b8da3b12cfe50de4f9c2ac81206c13ab392.

Conflicts:
	modules/twinklewarn.js
Re-add disruptive warning templates that were removed
Remove default behavior from "TW" link
Slight comment copyedit
Rename templates
Expand .gitignore with Windows and OS X
talkback: add heading for teahouse talkback
fluff: remove ClueBot NG from the bot whitelist

It is perfectly legitimate to want to roll back ClueBot NG's vandalism
reversions using type=vand rollback. So by that logic ClueBot shouldn't
be here. If I'm missing something please comment at WT:TW.
protect: set oldProtection after getting API result
Merge pull request #149 from jimmyxu/for-azatoth

protect: et oldProtection after getting API result
warn: remove uw-disruptive4, as it is a redirect to uw-generic4
warn: space fixes; hide article name in summary of generic block notices

Previously the edit summaries were like: "You have been blocked from editing on [[xyz]]." Well, no, you've been blocked from all articles. So it was misleading.
warn: (take 2) group warnings into categories; add and remove some warnings

- Level 1-4im warnings are now in optgroups.
- uw-redirectX, uw-afX, uw-icsX have all been removed
- This time I'm using jQuery data rather than expando properties, to
lower the chances of failure. However, I think the real cause of failure
was the jQuery code that assigned to |selectedEl|, so I have modified
that. Hopefully it doesn't fail this time!
speedy: add two missing deletion summaries
Merge branch 'master' of https://github.com/azatoth/twinkle.git
speedy: sorry, here's the second one
morebits: no longer "wpEditToken" but "token"; improve console log for Status

This might put an end to the problem of Twinkle truncating page
content... previously the token was sent before the text, which is a bad
thing.
protect: add protection tag to the end of redirects

So the redirect doesn't break.
batchundelete: hide the tab on non-existent user pages

It needs something to do!