Update Guava to 17.0 with appropriate changes for deprecation

This supersedes #53 
You're right, it broke :koala: I'll change it  back...