merge 2.3.0 updates into latest
update formats
fix typo
Merge pull request #71 from mapnik/update-latest

merge 2.3.0 updates into latest