Fixed up World, it is now a singleton so it can be accessed without being passed around

... etc etc
Merge branch 'master' of https://github.com/jdddog/hri