New parameters for river's head/kaylee's body.
Fixes python crash.
Merge branch 'bugfixes' of git://github.com/jzalinger/nbites
Merge branch 'master' into calibration

Conflicts:
	src/man/support/CameraCalibrate.cpp
Adds the field cross position as an option.
Updated parameters.