Merge remote-tracking branch 'upstream/develop' into develop
Getting new docs prepped
Merge branch 'develop' of github.com:sightmachine/SimpleCV into develop
Merge branch 'develop' of github.com:sightmachine/SimpleCV into develop
Revert "virtual camera upgrades - I did a lot of changes too closes #412"

This reverts commit 8e4b70570dad9553ee10f14b02c039c9bac8a06a.
Merge branch 'develop' of github.com:jayrambhia/SimpleCV into develop
Merge remote-tracking branch 'upstream/develop' into develop

loses #412"

This reverts commit 8e4b70570dad9553ee10f14b02c039c9bac8a06a.
trying to resolve broken tests
OpenCV 2.3.1 doesn't really support anything. Made appropriate changes.

Signed-off-by: jayrambhia <jayrambhia777@gmail.com>
Revert "virtual camera upgrades - I did a lot of changes too closes #412"

This reverts commit 8e4b70570dad9553ee10f14b02c039c9bac8a06a.
virtual camera upgrades - I did a lot of changes too closes #412
Merge remote-tracking branch 'upstream/develop' into develop
Merge branch 'develop' of github.com:jayrambhia/SimpleCV into develop
virtual camera upgrades - I did a lot of changes too closes #412
Merge branch 'develop' into Keypoints/test_cleanup