diff --git a/.gitignore b/.gitignore
index 134b78fa3..925d2e223 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,8 +3,9 @@ target/
 .project
 .settings/
 .idea/
+*.iml
 pom.xml.versionsBackup
 .#*
 target/
 pom.xml.releaseBackup
-release.properties
\ No newline at end of file
+release.properties
diff --git a/pom.xml b/pom.xml
index f084ee611..661578d1d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,110 +1,122 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <parent>
-    <artifactId>jar-pom</artifactId>
-    <groupId>com.addthis.common.build.maven.pom</groupId>
-    <version>3.8.0</version>
-  </parent>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <parent>
+        <artifactId>jar-pom</artifactId>
+        <groupId>com.addthis.common.build.maven.pom</groupId>
+        <version>3.8.0</version>
+    </parent>
 
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.clearspring.analytics</groupId>
-  <artifactId>stream</artifactId>
-  <packaging>jar</packaging>
-  <version>2.9.7-SNAPSHOT</version>
-  <name>stream-lib</name>
-  <description>A library for summarizing data in streams for which it is infeasible to store all events</description>
-  <url>https://github.com/addthis/stream-lib</url>
-  <licenses>
-    <license>
-      <name>Apache License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-    </license>
-  </licenses>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>com.clearspring.analytics</groupId>
+    <artifactId>stream</artifactId>
+    <packaging>bundle</packaging>
+    <version>2.9.7-SNAPSHOT</version>
+    <name>stream-lib</name>
+    <description>A library for summarizing data in streams for which it is infeasible to store all events</description>
+    <url>https://github.com/addthis/stream-lib</url>
+    <licenses>
+        <license>
+            <name>Apache License, Version 2.0</name>
+            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+        </license>
+    </licenses>
+
+    <properties>
+        <project.build.targetJdk>1.8</project.build.targetJdk>
+    </properties>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <version>3.0.0</version>
+                <extensions>true</extensions>
+            </plugin>
+        </plugins>
+    </build>
 
- <properties>
-    <project.build.targetJdk>1.8</project.build.targetJdk>
-  </properties>
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>com.google.guava</groupId>
+                <artifactId>guava</artifactId>
+                <version>23.3-jre</version>
+            </dependency>
+            <dependency>
+                <groupId>it.unimi.dsi</groupId>
+                <artifactId>fastutil</artifactId>
+                <version>8.1.1</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
 
-<dependencyManagement>
     <dependencies>
+        <dependency>
+            <groupId>it.unimi.dsi</groupId>
+            <artifactId>fastutil</artifactId>
+        </dependency>
+
+        <!-- Test -->
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.12</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-simple</artifactId>
+            <version>1.7.25</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>colt</groupId>
+            <artifactId>colt</artifactId>
+            <version>1.2.0</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.googlecode.charts4j</groupId>
+            <artifactId>charts4j</artifactId>
+            <version>1.3</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
+            <version>1.11</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>23.3-jre</version>
+            <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>it.unimi.dsi</groupId>
-            <artifactId>fastutil</artifactId>
-            <version>8.1.1</version>
+            <groupId>org.apache.mahout</groupId>
+            <artifactId>mahout-math</artifactId>
+            <version>0.13.0</version>
+            <scope>test</scope>
         </dependency>
     </dependencies>
- </dependencyManagement>
-
-  <dependencies>
-    <dependency>
-      <groupId>it.unimi.dsi</groupId>
-      <artifactId>fastutil</artifactId>
-    </dependency>
 
-    <!-- Test -->
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-simple</artifactId>
-      <version>1.7.25</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>colt</groupId>
-      <artifactId>colt</artifactId>
-      <version>1.2.0</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.googlecode.charts4j</groupId>
-      <artifactId>charts4j</artifactId>
-      <version>1.3</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>commons-codec</groupId>
-      <artifactId>commons-codec</artifactId>
-      <version>1.11</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.mahout</groupId>
-      <artifactId>mahout-math</artifactId>
-      <version>0.13.0</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
+    <developers>
+        <developer>
+            <name>Matt Abrams</name>
+            <email>abramsm@addthis.com</email>
+        </developer>
+        <developer>
+            <name>Chris Burroughs</name>
+            <email>christopher@addthis.com</email>
+        </developer>
+    </developers>
 
-  <developers>
-    <developer>
-      <name>Matt Abrams</name>
-      <email>abramsm@addthis.com</email>
-    </developer>
-    <developer>
-      <name>Chris Burroughs</name>
-      <email>christopher@addthis.com</email>
-    </developer>
-  </developers>
-
-  <scm>
-    <connection>scm:git:git@github.com:addthis/stream-lib.git</connection>
-    <developerConnection>scm:git:git@github.com:addthis/stream-lib.git</developerConnection>
-    <url>https://github.com/addthis/stream-lib</url>
-    <tag>HEAD</tag>
-  </scm>
+    <scm>
+        <connection>scm:git:git@github.com:addthis/stream-lib.git</connection>
+        <developerConnection>scm:git:git@github.com:addthis/stream-lib.git</developerConnection>
+        <url>https://github.com/addthis/stream-lib</url>
+        <tag>HEAD</tag>
+    </scm>
 </project>