Added num_mixtures to settings.
Merge branch 'master' of github.com:gustavla/vision-research