Fix tests failing
Merge branch 'master' of github.com:bnoi/scikit-tracker
Various fix