Added model.cancel for removing callbacks added by when
Merge branch 'gh-pages' of github.com:curran/model into gh-pages