Upgrade to Guava 16.0.1 to fix JDK and Guava TypeVariable compatibility: https://code.google.com/p/guava-libraries/issues/detail?id=1635
Merge pull request #2361 from benmccann/guava-upgrade-16_0_1

Upgrade to Guava 16.0.1 to fix JDK and Guava TypeVariable compatibility