grayPeaks implemented
more docs.
Merge pull request #370 from jayrambhia/Tracking/remake

A glitch in bounding box conversion and more docs added.
Merge pull request #369 from rajatkapoor/graypeaks

grayPeaks implemented. Awesome. This helps a lot of people.
Added a sortX & Y to featuresets, added flavor option to keypoint clusters
Merge branch 'develop' of github.com:ingenuitas/SimpleCV into develop
Update README.markdown

Trying to make OSX instructions more readable. 
Removed redundant and confusing instructions.
Needed to cast to long
Merge branch 'develop' of git://github.com/ingenuitas/SimpleCV into develop
changed image set print to warning
Fixed unit test for keypoint clusters to default to sift as ORB may not be supported on older versions of OpenCV
Cleaning up broken unit test
FIX tempfile name in windows

 in windows, tempfile would be like this:
	'r:\\temp\\tmphngayy.png'
 so, the original loc string will not works
    loc = '/tmp/' + tf.name.split('/')[-1]
 because of the '/' in path name and '/tmp/' are NOT exist
findPeaks() implemented for LineScan
Added Travis-CI build widget to README
Fixing formatting.
Try this again
Not sure why this isn't working.
markdown vs. rest