Bump snapshot version.
Add merge-options and with-options helpers.
Set patch version 0.6.1
Merge branch 'release-0.6.1'

Conflicts:
	README.md
	project.clj
Merge remote-tracking branch 'origin/master'