various minor changes
Merge remote-tracking branch 'origin/python' into python

Conflicts:
	double_pendulum.py