Fixing Docstrings for doc building
Fixed Docstrings in Camera Class
Merge branch 'develop' of github.com:sightmachine/SimpleCV into develop
Fixed Display docstring
Some Image docstring cleanup
Merge remote-tracking branch 'upstream/develop' into develop