PEP8 and other fixes.
Merge branch 'multi_b' of https://github.com/klchan13/osmosis into multi_b