More tweaks to e-mail plugin.. also made temporary fix to !replyrate
Merge remote-tracking branch 'origin/master'

Conflicts:
	plugins/Email.py