Reintegrate all skyshard changes

pom.xml

@@ -3,9 +3,13 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
+    <prerequisites>
+        <maven>3.0</maven>
+    </prerequisites>
+
     <groupId>org.clojars.smallrivers</groupId>
     <artifactId>snacktory</artifactId>
-    <version>1.3.6-SNAPSHOT</version>
+    <version>1.4.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>Snacktory</name>
@@ -41,6 +45,24 @@
           <version>2.6</version>
         </dependency>
 
+        <dependency>
+          <groupId>org.apache.commons</groupId>
+          <artifactId>commons-lang3</artifactId>
+          <version>3.4</version>
+        </dependency>
+
+        <dependency>
+          <groupId>com.google.guava</groupId>
+          <artifactId>guava</artifactId>
+          <version>19.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>net.sourceforge.htmlcleaner</groupId>
+            <artifactId>htmlcleaner</artifactId>
+            <version>2.16</version>
+        </dependency>
+
         <!-- only needed to make logging work during tests -->
         <dependency>
             <groupId>org.slf4j</groupId>
@@ -65,7 +87,7 @@
                 <inherited>true</inherited>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.1</version>
+                <version>3.5.1</version>
                 <configuration>
                     <source>1.6</source>
                     <target>1.6</target>
@@ -74,15 +96,15 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-resources-plugin</artifactId>
-                <version>2.6</version>
+                <version>2.7</version>
                 <configuration>          
                     <encoding>UTF-8</encoding>
                 </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.18.1</version>
+                <version>2.19.1</version>
                 <configuration>
                     <systemProperties>
                         <property>

project/Build.scala

@@ -2,17 +2,20 @@ import sbt._
 import Keys._
 
 object Dependencies {
-  val Jsoup = "org.jsoup" % "jsoup" % "1.7.2"
+  val Jsoup = "org.jsoup" % "jsoup" % "1.8.3"
   val Slf4jApi = "org.slf4j" % "slf4j-api" % "1.6.6"
   val Slf4jLog4j12 = "org.slf4j" % "slf4j-log4j12" % "1.6.6" 
   val CommonsLang = "commons-lang" % "commons-lang" % "2.6"
+  val CommonsLang3 = "org.apache.commons" % "commons-lang3" % "3.4"
   val Log4j = "log4j" % "log4j" % "1.2.14"
+  val Guava = "com.google.guava" % "guava" % "19.0"
+  val HtmlCleaner = "net.sourceforge.htmlcleaner" % "htmlcleaner" % "2.16"
 }
 
 object SnacktoryBuild extends Build {
   import Dependencies._
 
   lazy val root = Project("snacktory", file("."), 
                     settings = Defaults.defaultSettings ++ 
-                    Seq(libraryDependencies ++= Seq(Jsoup, Slf4jApi, Slf4jLog4j12, CommonsLang, Log4j)))
+                    Seq(libraryDependencies ++= Seq(Jsoup, Slf4jApi, Slf4jLog4j12, CommonsLang, CommonsLang3, Log4j, Guava, HtmlCleaner)))
 }