fixed it up apparently.
Merge branch 'master' of https://github.com/mlakewood/cerberus into working

Conflicts:
	project.clj