Merge branch 'master' of github:tbeigle/psc
Merge branch 'develop'
Adding the SMTP module.
Committing Greg's changes to the timeout defaults. These should eventually be moved into something compatible with Drupal so they don't end up lost with the next update.
Merge branch 'mailServers' into develop