Better equals conditioning that looks up ERPs defined in the body of a query.
Merge branch 'master' of https://github.com/probmods/webchurch

Conflicts:
	js_astify.js