Change code to work with latest OpenCV 2.*
Remove Trax from cmake
Re-add trax to CMake
Merge pull request #2 from Overv/master

Change code to work with latest OpenCV 2.*