refactors calibrate.py a little for easier reading/using
Merge branch 'master' of github.com:basilleaf/blackcat