Bug fix and accompanying scenariio for edit charity address and geocoding
Added rspec for bug fix
More rspec tests
Merged conflicts from master
Merge pull request #13 from mtc2013/master

bug fix with specs/cucumber