Various changes.
Merge branch 'multi_b' of https://github.com/klchan13/osmosis into multi_b

Conflicts:
	osmosis/predict_n.py