Initial Pass. Crosses fingers.
Change this to... 2
Merge branch 'master' into feature-mandril_quota_api_support
The new, "Program Name" opt. should now, uh: work.
This fleshed out the Mandrill stuff, by providing a way to test your creds and a somewhat helpful message if there's something a-miss.