Merge pull request #40 from mtc2013/master

Merged in our admin_edit_charity branch with passing cukes and specs
Sign-in/up link name changes with specs and cukes
Merge pull request #42 from mtc2013/link_name_tweaks

Sign-in/up link name changes with specs and cukes
Edit links for users with organization assocation and admins
Merge pull request #43 from mtc2013/edit_buttons

Edit links for users with organization assocation and admins
adding support to run simplecov - just run rake spec and coverage directory will be created
filling in some test coverage gaps
cleaning up the presentation of the edit link for admins etc.