fix broken test
slam incoming perf-asmts
Merge branch 'dev' of github.com:vlacs/oarlock into dev

Conflicts:
	project.clj
freshen schematode