dynamic unit selection in hourly output instead of being fixed to KiB (fixes #4)
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/dbshow.c