first pass at refactoring and upgrading spring social 1.1.0.RELEASE