Generalize assoc-when into macro
Version updates/fixes
Merge branch 'master' of github.com:webnf/webnf