Take more options
Merge branch 'ensemble' into phido

Conflicts:
	lib/big_ml/ensemble.rb