Merge pull request #102 from tansaku/develop

First go at an email import feature that would take a list of emails and associate with existing organizations
Merge branch 'develop' of https://github.com/tansaku/LocalSupport into develop
Merge branch 'develop' of https://github.com/tansaku/LocalSupport into develop
Added sad path for organization add_email
Corrected csv filename in rake task to be email_test.csv
Merge pull request #103 from mtc2013/develop

The in progress work of develop branch's "support for targeted email for pre-approved email addresses" feature