Merge pull request #164 from sean-morris/dev

Removed the wkt field
Revert "Removed the wkt field "
Merge pull request #165 from calpath/revert-164-dev

Revert "Removed the wkt field "
Nasty build and test failures with model-database-access, even with the pending pull request.  Revert until we're ready