Merge pull request #580 from Oldiesmann/release-2.1

Disregard -> Unwatch
Merge pull request #581 from Oldiesmann/release-2.1

disregard -> unwatch in upgrade SQL files
Fixes 583

Signed-off-by: jdarwood007 <github2@sleepycode.com>
Fixes 582 template issue

Signed-off-by: jdarwood007 <github2@sleepycode.com>
Merge pull request #585 from jdarwood007/fixes-583

Fixes 583
Merge pull request #587 from jdarwood007/fixes-582

Fixes 582 template issue