Fix java.util.ConcurrentModificationException for "gaiden watch"
Merge pull request #31 from kobo/fix-concurrency

Fix java.util.ConcurrentModificationException for "gaiden watch"