I blew away xamoxs changes,I don't want to incur his wrath
Merge branch 'develop' of github.com:kscottz/SimpleCV into develop
Merge branch 'develop' of github.com:sightmachine/SimpleCV into develop