Reformat with pycharm (fix PEP8 issues)
Merge branch 'daniel-branch'

Conflicts:
	src/framed/bioreactor/dyssco.py