For some reason this wouldn't merge clean, fixed now, closes #367
For some reason this wouldn't merge clean, fixed now, closes #367

jayrambhia/SimpleCV2,jayrambhia/SimpleCV2,jayrambhia/SimpleCV2,jlegendary/SimpleCV,beni55/SimpleCV,beni55/SimpleCV,beni55/SimpleCV,sightmachine/SimpleCV,onaclovtech/SimpleCV,gskielian/SimpleCV,sightmachine/SimpleCV2,sightmachine/SimpleCV,hurdlea/SimpleCV,nils-werner/SimpleCV,jlegendary/SimpleCV,onaclovtech/SimpleCV,tpltnt/SimpleCV,sightmachine/SimpleCV,jayrambhia/SimpleCV2,sightmachine/SimpleCV,onaclovtech/SimpleCV,jyt109/SimpleCV,tpltnt/SimpleCV,nils-werner/SimpleCV,jyt109/SimpleCV,hayd/SimpleCV,tpltnt/SimpleCV,hurdlea/SimpleCV,jyt109/SimpleCV,tpltnt/SimpleCV,gskielian/SimpleCV,hurdlea/SimpleCV,sightmachine/SimpleCV2,nils-werner/SimpleCV,jlegendary/SimpleCV,jyt109/SimpleCV,sightmachine/SimpleCV,gskielian/SimpleCV,nils-werner/SimpleCV,nils-werner/SimpleCV,jyt109/SimpleCV,hurdlea/SimpleCV,hayd/SimpleCV,beni55/SimpleCV,hayd/SimpleCV,jlegendary/SimpleCV,beni55/SimpleCV,gskielian/SimpleCV,hayd/SimpleCV,gskielian/SimpleCV,jlegendary/SimpleCV,sightmachine/SimpleCV2,hurdlea/SimpleCV,sightmachine/SimpleCV2,hayd/SimpleCV,onaclovtech/SimpleCV,tpltnt/SimpleCV,onaclovtech/SimpleCV