waypoints
Merge branch 'master' of https://github.com/chyld/civic-hacking
merge fixes