tweaks for the email import feature
Merge branch 'develop' of https://github.com/tansaku/LocalSupport into develop
oops, forgot to test specs on new cvs headers
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
rough draft of cuke test for having new users matched to their orgs, granting edit powers
when user confirms account, devise calls .confirm! on user
added negation option to "user sees edit button" step
added actual new user generation steps at end of sign up definition
TLC for update_attributes_with_admin
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
adjusted rake task so we can pass args to indicate which file to load - am thinking we need to trim for spaces as well and check for whether we are overwriting existing emails
removed explicit call to make new user
added promote_new_user method to give users edit powers after confirm if they have same email as org
outline of rspec tests for User#promote_new_user
deactivated "confirmed at" attribute for user for rspec testing in user_spec.rb
building rspec tests to attempt to simulate user confirming account via email
Merge remote-tracking branch 'johnnymo87/master' into develop
updates on authorization feature