diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000000..fa7042ba275
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,9 @@
+# Maven
+target
+
+# IntelliJ IDEA
+.idea
+*.iml
+
+# OS X
+.DS_Store
diff --git a/pom.xml b/pom.xml
index 730e478f7bd..f43ba20f40f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -137,7 +137,7 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <okhttp.version>2.0.1-SNAPSHOT</okhttp.version>
+    <okhttp.version>2.1.0</okhttp.version>
     <netty.version>5.0.0.Alpha2-SNAPSHOT</netty.version>
     <jetty.alpn.version>8.0.0.v20140317</jetty.alpn.version>
     <jetty.alpn.path>