renamed population_manager and loads of stuff to remove routable class
Merge remote-tracking branch 'origin/master'