everything going nuts
Merge branch 'big-changes'

Conflicts:
	test/oj/core_test.clj
use multimethods for sql-val, many more tests