white space fixes
Merge branch 'master' of https://github.com/cakey/ekon

Conflicts:
	sim.py