waypoints are dead. long live waypoints. closes #189
Merge branch 'master' of github.com:nprapps/tshirt