fix some pep8 problems

Conflicts:
	timeline.py