Upgrade to Spring 4

Tentatively targeting 3.2.0-GA, this is likely to change.

[What's new in 4.0](http://docs.spring.io/spring-framework/docs/4.0.x/spring-framework-reference/htmlsingle/#new-in-4.0)