Rename calibration stuff
Add methods for storing horizontal calibration
Merge branch 'master' into horizontal_calibration
Enable horizontal calibration