Merge branch 'develop' of github.com:ingenuitas/SimpleCV into develop
fixed ROI feature to autodetect image parameters
fixed merge conflict on Keypoint feature