Move to guice 3.0