Merge branch 'develop' of git://github.com/ingenuitas/SimpleCV into develop
move aquisition to getImage()
use single frame mode
Merge branch 'develop' of git://github.com/ingenuitas/SimpleCV into develop
added more ouput to confusion matrix
added stegasaurusography.
Watershed method implemented
Merge branch 'develop' of git://github.com/ingenuitas/SimpleCV into develop
favis specific updates
mods to Confusion Matrix
Added repr to return UniqueID
added support for more than one kinect device.
Merge pull request #300 from salil93/wshed

Watershed method implemented. Sorry about the delay, we were swamped with a customer. This looks fantastic!
Merge pull request #304 from ricardogsilva/multiple_kinects

added support for more than one kinect device.
Merge branch 'develop' of github.com:ingenuitas/SimpleCV into derp
slight tweak to the turking module
Merge branch 'develop' of github.com:ingenuitas/SimpleCV into develop
Merge branch 'derp' into develop
did some crop stuff, also ran a script over the source tree to clean up tab issues, everything should be four spaces now
fixed watershed, works awesome