Merge pull request #5 from marbindrakon/develop

Pulling from origin.
Made SMTP settings clearer and added documentation.
Merge pull request #112 from acdervis/develop

Added documentation for SMTP settings, fixed misnamed settings.