Merge conflicted config
Merge branch 'develop' of git@github.com:tearne/Sampler.git into develop
About to try adding mode company farms
Merge branch 'develop' of git@github.com:tearne/Sampler.git into develop

Conflicts:
	sampler-examples/src/main/scala/sampler/example/genes/Network.scala