version update
Merge branch 'master' into 0.1.x
Merge branch 'master' into 0.1.x

Conflicts:
	project.clj
updated version grab
version change from merge