Moved over to OpenCV completely

Need to test on Mac OS and Linux