Upgrade to guava 18, clean up FutureConverter