Merge pull request #84 from mtc2013/add_charity_admin

Add charity admin
Merge pull request #85 from mtc2013/add_charity_admin

Small fix to make div render as div from charity admin listing helper
adding metric_fu
getting test coverage back up to 100%
refactored category html drop down options into category model - now we have a class method, wondering about refactoring into the view ...
adding spec for new category class method html_drop_down_options
extracting some address specific functionality to an address class with associated spec - ultimately would be nice if the geocoding was associated with addresses rather than organizations
Merge pull request #86 from tansaku/refactoring

Refactoring
merging conflicts between Sam and Risa/Rafael's refactorings
Removed prefatory error message when organization has errors; used en.yml localization to fix the human string for Organization to be Organisation