Updated to new patch from March

It includes the trackpoint patch from @vencik.
Merge pull request #6 from vmx/master

Updated to new patch from March