Initial work for #2: ensure that code can be built against scala 2.10.0