Updated to latest Spring
Fixed all build problems

Add one final Ignore to a test
Removed the last local hack to include jars