Tolerate multiple watch/unwatch calls. Return value indicates if watch/unwatch was successful.
Merge pull request #7 from andyburke/master

Tolerate multiple watch/unwatch calls...