Version bumps
added back in timbre
Merge branch 'master' into 0.1.2

Conflicts:
	project.clj