clean up org controller & add ntee data to org show
Merge branch 'charity_verifier' with some org controller cleanup