Merge pull request #1 from rterbush/pre-deploy

Add a few more fields to the export and fix a few 2.0 compatibility issu...