domap additions
Merge branch 'master' of github.com:mars0i/popco-x

Conflicts:
	test/popco/domaptest.clj