Changes from this morning so brad can see them

Note that this should resolve #148
finishing up testing
Update README.md
Merge pull request #161 from CityGenerator/develop

update res gen