Midway point.
Merge branch 'master' of github.com:nprapps/wolves
Adds waypoints -- no fading or anything fancy yet.
Merge branch 'master' of github.com:nprapps/wolves