Merge pull request #1 from edx/master

up to date
add some vars for smtp backend

add some vars for smtp backend
Update AUTHORS
Merge pull request #2 from fmyzjs/patch-2

Patch 2