added specs and features to get admin to approve charity admin. all that's left is the links/views. everything passes right now
some things were accidentally left out of last commit
added starter spec for corner case when 2 admins might try to approve user around the same time
added reject_charity_admin functionality. all spec and cucumber passes. also moved some scenarios from this-is-my-org to admin-approves-charity-admin
finished admin-approves-charity-admin feature with bonus rejection. all specs and feature files pass
light refactoring of scenario steps
resolving merge with risa et al's work on site admin approving charity admins
some DRYING of this is my org feature, and increasing test coverage and removing some cruft