Update to Guava 15
Merge pull request #15 from snowell/feature/guava15

Update to Guava 15