bad kat, you broke the build for a hot minute
Merge branch 'develop' of github.com:ingenuitas/SimpleCV into develop