Reverted namespace change
Merge branch 'master' into 1.0.2

Conflicts:
	project.clj