Added additional information to project.clj
Merge branch 'myns' into 1.0.2

Conflicts:
	project.clj