Macros I forgot to commit.
Merge in changes.
Merge branch 'master' of https://github.com/mahinshaw/joc

* 'master' of https://github.com/mahinshaw/joc:
  More macros.

Conflicts:
	src/joc/macros.clj