Minor code cleanup.
Restructured initialization logic, plus lots of code cleanup.
Call ingest.php only once.  Use geocode.php for geocoding.
Merge branch 'dev' into test