Re applied Brandon's change to the email class.
Removed object to array conversion in the mailer class, added a data var to the class
Merge pull request #111 from cjemagid/3.0

Changed the email class
in process of adding mandrill support for class.mailer.php
updated mailer class to allow providers
Merge pull request #113 from cjemagid/3.0

added support for providers
Update reset-password.php
fix curl timeout
Merge branch 'upstream/3.0'