By aligning the camera coordinate system axes with the image axes, I managed to bring a bit more sanity to the camera matrices. This also has the advantage of bringing our camera coordinate system into line with OpenCV's camera coordinate system (I think)