Fix watcher not updating to reflect certain changes
Merge pull request #333 from nathan/watcher-update

Fix watcher not updating to reflect certain changes