Work on city generator
other crap stuff

we need a good .gitignore
merge commit