PEP8-ed startup
Python3 edits
Merge branch 'master' of https://github.com/martindurant/misc

Conflicts:
	fitting.py
	startup.py