Multi-Touch MouseTracker Update

Ready to pull request, merging upstream changes and running tests.