Fixed the deprecated call to MapMaker().makeComputingMap - that method is now private and inaccessible.  Updated guava while I was at it.