Upgraded to Google Guava 16.0.1 and Spring 4, plus updates to related libraries