update to Guice 4.1

Right now trunk uses Guice 4.0, which is about a year old. We should update to 4.1, so long as we're making the jump from 3 to 4 in the branch-2 -> 3.0 transition.