rudimentary cuepoints
fix merge
Merge branch 'master' of github.com:nprapps/wolves