Merge some older commits that never made it into pull requests

Conflicts: pokemontools/map_editor.py
- overwrite export_lz_to_png with export_2bpp_to_png