Updated to use OpenCV 3.0.0 master branch