Restore of Ruza's version.
Merge branch 'master' of github.com:meawoppl/circulation

Conflicts:
	makeGasketLaser.py
Merge branch 'master' of github.com:meawoppl/circulation
I made the mistake of working on this while super tired.  I will come back tomorrow AM, and work this.