Trying to appease the TravisCI beast
Merge branch 'develop' of https://github.com/sightmachine/SimpleCV into develop