remove extra tracking.py copy
Merge branches 'master' and 'master' of https://github.com/seren/TC2
Re-added changes from 49ac09