merge in some BAMF stuff
merge in some BAMF stuff

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