cleanup
Merge branch 'master' into seperate

* master:
  move ffmap-helpers

Conflicts:
	ffmap-helpers/city-change.sh
	ffmap-helpers/mymap.sh
	ffmap-helpers/wiki-crawl.py
	ffmap-helpers/wikimigrate.py