Starting work on 1.6: upgrading to guice:3.0