Merge pull request #289 from jessevondoom/master

Simple mode
Merge pull request #290 from jessevondoom/master

Simple mode on by default
Fixing spelling error
Merge pull request #292 from flashpunk/master

Fixing a minor spelling error. (Ha...oops. Yeah there are probably more of these...)
bringing in mandrill integration code
Merge remote-tracking branch 'upstream/master'