Deal with a some language.* scala 2.10 migration warnings
Merge branch 'develop' of git@github.com:tearne/Sampler.git into develop
Add some TODOs
New cluster prototype, with sbt microkernal build
Merge branch 'develop' of git@github.com:tearne/Sampler.git into develop