added metric variants, improved test'
Merge branch 'develop' of https://github.com/rinde/RinSim into develop