CityGenerator now using templates
renamed NameGenerator to NPCGenerator
Added some unit tests for NPCGenerator, it's at 100% coverage, wooo