Reconfigured database for city/state.
Merge branch 'master' into cole
Merge pull request #41 from areveal/cole

Cole