Calibration updates. Fixing auto-configged make file
Merge branch 'master' of github.com:/jwcrawley/3D-scanner

Fixed calibration, and applies to all calibration windows now.