Refactoring, improved method names
Added tests, Watchman::deleteTrigger() accepts Watch argument