update changelog
update package.json
Revert "bump package.json"

This reverts commit 96a442e81cb4e5f5438185785a44ca9547e15118.
Merge branch 'master' into mapnik-strict