Put file autocompletion for -D
When serving, move first to output dir, then serve, then come back
Fix bug if output_dir is empty string (makedirs failing)
Update to latest GeoNames
Update --help
Merge branch 'public' into pypy
Fix tests
Merge branch 'public' into pypy