fixed up PopulationHandler to support multiple pop types
 it's also really really pretty now
Merge remote-tracking branch 'origin/master'