killbill-memoizeit

diff --git a/pom.xml b/pom.xml
index 5b5caca..cc13d73 100644
--- a/pom.xml
+++ b/pom.xml
@@ -267,14 +267,9 @@
                 <version>1.2</version>
             </dependency>
             <dependency>
-                <groupId>org.apache.directory.studio</groupId>
-                <artifactId>org.apache.commons.io</artifactId>
-                <version>2.1</version>
-            </dependency>
-            <dependency>
                 <groupId>commons-io</groupId>
                 <artifactId>commons-io</artifactId>
-                <version>2.0</version>
+                <version>2.1</version>
             </dependency>
             <dependency>
                 <groupId>commons-lang</groupId>

diff --git a/server/pom.xml b/server/pom.xml
index 1e4a111..0bd8220 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -29,88 +29,35 @@
         <logback.version>1.0.1</logback.version>
         <metrics.version>2.1.2</metrics.version>
         <skeleton.version>0.1.4-SNAPSHOT</skeleton.version>
-        <async-http-client.version>1.6.5</async-http-client.version>
+        <async-http-client.version>1.7.1</async-http-client.version>
     </properties>
 
     <dependencies>
-    <!-- Jetty test scope -->
-    <dependency>
-        <groupId>org.eclipse.jetty</groupId>
-        <artifactId>jetty-http</artifactId>
-        <version>${jetty.version}</version>
-        <scope>test</scope>
-    </dependency>
-    <dependency>
-        <groupId>org.eclipse.jetty</groupId>
-        <artifactId>jetty-io</artifactId>
-        <version>${jetty.version}</version>
-        <scope>test</scope>
-    </dependency>
-    <dependency>
-        <groupId>org.eclipse.jetty</groupId>
-        <artifactId>jetty-util</artifactId>
-        <version>${jetty.version}</version>
-        <scope>test</scope>
-    </dependency>
-    <dependency>
-        <groupId>org.eclipse.jetty</groupId>
-        <artifactId>jetty-server</artifactId>
-        <version>${jetty.version}</version>
-        <scope>test</scope>
-    </dependency>
-    =======
-    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>
-    <parent>
-        <groupId>com.ning.billing</groupId>
-        <artifactId>killbill</artifactId>
-        <version>0.1.14-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>killbill-server</artifactId>
-    <name>killbill-server</name>
-    <packaging>war</packaging>
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <guice.version>3.0</guice.version>
-        <jersey.version>1.12</jersey.version>
-        <jetty.version>8.1.2.v20120308</jetty.version>
-        <logback.version>1.0.1</logback.version>
-        <metrics.version>2.1.2</metrics.version>
-        <slf4j.version>1.6.4</slf4j.version>
-        <skeleton.version>0.1.2</skeleton.version>
-        <async-http-client.version>1.6.5</async-http-client.version>
-    </properties>
-
-    <dependencies>
-        <!-- Jetty provided scope -->
+        <!-- Jetty test scope -->
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-http</artifactId>
             <version>${jetty.version}</version>
-            <scope>provided</scope>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-io</artifactId>
             <version>${jetty.version}</version>
-            <scope>provided</scope>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-util</artifactId>
             <version>${jetty.version}</version>
-            <scope>provided</scope>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-server</artifactId>
             <version>${jetty.version}</version>
-            <scope>provided</scope>
+            <scope>test</scope>
         </dependency>
-        >>>>>>> integration
-
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-deploy</artifactId>
@@ -130,13 +77,6 @@
             <scope>test</scope>
         </dependency>
 
-        <
-        <
-        <
-        <
-        <
-        <
-        < HEAD
         <!-- NOT in master POM; include version as well -->
         <dependency>
             <groupId>org.weakref</groupId>

diff --git a/util/pom.xml b/util/pom.xml
index a227563..e12a090 100644
--- a/util/pom.xml
+++ b/util/pom.xml
@@ -75,10 +75,6 @@
             <artifactId>commons-email</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.directory.studio</groupId>
-            <artifactId>org.apache.commons.io</artifactId>
-        </dependency>
-        <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
             <scope>test</scope>