Refactored registration/password retrieval specs that reflect current state of the system
Merge pull request #34 from mtc2013/exploratory_emailtesting

Refactored a little bit to get registration/password retrieval spec workflows cleaner
Merge branch 'master' into admin_edit_charity
Merge pull request #35 from mtc2013/admin_edit_charity

My changes for admin_edit_role
Merge branch 'admin_edit_charity' of github.com:tansaku/LocalSupport into admin_edit_charity
Merging michael's specs and migration
happy and sad paths for admin editing any organization info