kalman filter improved
Merge remote-tracking branches 'upstream/develop' and 'origin/develop' into develop
Added interpolation argument to Image.scale.
Merge pull request #282 from Anoven/develop

Added interpolation argument to Image.scale
Merge pull request #281 from jayrambhia/kalman_filter

kalman filter improved
Fixing the Image operators(__add__,__sub__,__and__,__or__) for scalars.

They weren't working as intended with color pictures and scalars. Example:
Image((100,100))+100 should yield an image that's gray now. Before it only added to the blue channel.

I guess there's probably a need for adding tuples to the image, but I didn't really need that atm. Though i still think this is a better behavoir for the
moment(adding to all channels).
Merge branch 'develop' of git://github.com/ingenuitas/SimpleCV into develop
Merge pull request #283 from Anoven/develop

Fixing the Image operators(__add__,__sub__,__and__,__or__) for scalars.
Removed required scikits learn import
looks like there was an indentation error in the keypoints function
findFeatures added
undo changes in drawing layer
Merge pull request #286 from jayrambhia/harris_features

Harris features(corner) and Szeliski features added.
Merge remote-tracking branch 'upstream/develop' into develop
grid feature improved
grid feature improved
docs added
exit() commented
Merge pull request #288 from salil93/grid

Grid method improved
Merge pull request #285 from uprasad/develop

Min Bounding Circle (issue #137)