Add instrumenting to waypoints.
Merge branch 'master' of github.com:nprapps/buzkashi