slight changes
Merge branch 'master' of https://github.com/gervaislab/g2python

Conflicts:
	recordsweep/recordsweep.py
Merge branch 'master' into sliders