In middle of updating to 2.10.1 and Sampler 0.0.10
Merge branch 'develop' into ot

Conflicts:
	build.sbt
	src/test/scala/org/tearne/crosser/distribution/components/PlantDistMetricSpec.scala
Finishing off merge