fix whitespace
Update emails for watchers
Clean up tests, add email assert
Merge remote-tracking branch 'yelp/pushmanager/add_watchers' into watchers