Cleaner urdf

Splitting Guillaume's pull request #109 to make it easier to merge in different places.