Upgrade to guava 18
8 files changed