Upgrade spring

This upgrades spring to the latest version. I was running into problems with the earlier version.