Hendrik Leppkes:
	- Remove bindings to the Waypoints module, which doesn't exist anymore
	- Fixes for changed Gatherer API
