added options to estimate_pose in preparation for job on xavier
Merge remote-tracking branch 'origin/master'