Beef up package.json.
Back to master.
Merge branch 'master' into svg-tiles
Refactor format switching, add tests for formats.