Whitespace cleanup.
Add decorator to allow timeout function to be printed more legibly.
Get rid of the --verbose flag and add the use of logging instead.
Fixes to get self tests passing again