cleanup matchTemplate
Merge branch 'dev' of github.com:firepick1/FireSight into dev