trim trailing space
Fix up waiting code
fix a few logging peeves.
Merge branch 'kdm'

Conflicts:
	timedcapture.py