Commits from the merge
 * remove pybonjour dependency for backwards compatibility
 * remove junk log messages in example driver