Merge pull request #99 from noobur/develop

Issue #78 fix and requirements.txt change
Merge pull request #100 from noobur/develop

fixed typo
Resolved #101, removed logger from json
Merge branch 'develop' of github.com:CityGenerator/Megacosm-Generator into develop
First go at refactoring logging stuff
Merge branch 'feature/log-reconfigure' into develop

This fixes some logging issues (I hope)
hopeful fix for stupid logging problem
fix for mundane items
fix for vimrc duplication.
Merge pull request #1 from CityGenerator/develop

Pulling in latest updates for my fork.