Updated template files and guava version.

Updated all of the template files to reflect changes to Spark/Shark,
and also upgraded Guava for consistency with Shark.