Added gitignore.
Fixed merge conflict.
Stop watching when watch key is invalid, not when it is invalid.