Reduce expected callback call_count in Watcher integration tests.
Pep8 cleanup
Merge branch 'reduce_callback_execution' into 0.3.0-release-prep