Watershed method implemented
mods to Confusion Matrix
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
forgot some test images
this fixes a few tests and slice notation, just realized I was on the wrong branch
Merge branch 'feature/ShapeContext' into develop
Okay not done, I think I am going to get this working and then push it up to the feature class and do extensive testing, that will be messy
still a lot to do, hope this is worth it
this should allow you to run the shell with inline matplotlib plots i.e. simplecv notebook --pylab inline
How did this not exist?
extra prints in blob removed
Merge pull request #306 from kscottz/develop

this should allow you to run the shell with inline matplotlib plots i.e....
Merge branch 'develop' of github.com:ingenuitas/SimpleCV into feature/ROIFeature