buildOns now working again, but without restoreStates on them
Merge branch 'master' of github.com:encorelab/CommonKnowledge