Integrating some of the procedural city stuff
added a test for join_rings
Fixed some errors in the generation code
Fix export
merge