multiple small changes, plus new sprinkle schedule
Merge branch 'master' of github.com:explainer/waterman