Fixing city & state update when Guidestar is used to update an existing nonprofit. Also cleaning up some code.
Merge branch 'master' of https://github.com/dssg/givinggraph