Updates to the generation scripts.
Merge branch 'bkg-mixture' of github.com:gustavla/vision-research into bkg-mixture

Conflicts:
	detector/analyze_dets.py