Merge remote-tracking branch 'azatoth/master'

Conflicts:
	modules/friendlytag.js
	modules/friendlytalkback.js
	modules/friendlywelcome.js
	modules/twinklearv.js
	modules/twinkleconfig.js
	modules/twinklefluff.js
	modules/twinkleprotect.js
	modules/twinklespeedy.js
	modules/twinklewarn.js
	sync.pl
	twinkle.header.js