Clean up some functions
Merge branch 'master' of https://github.com/noprompt/garden

Conflicts:
	src/garden/units.clj