get/setMetric->metric, get/setRmax->rMax
Merge branch 'master' of github-paumard:gyoto/Gyoto

Conflicts:
	include/GyotoPolishDoughnut.h