Guice update

@theefer Basically reverting this change as there's a new version of openid4java.

Messy commit history, sorry.