diff --git a/.gitignore b/.gitignore
index fbfb620..430bb02 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,7 +9,6 @@ config/deploy.rb
 config/deploy
 config/mongoid.yml
 config/newrelic.yml
-config/unicorn.rb
 .rvmrc
 .idea
 *~
diff --git a/docs/deployment/capistrano.md b/docs/deployment/capistrano.md
index 7c60def..796f157 100644
--- a/docs/deployment/capistrano.md
+++ b/docs/deployment/capistrano.md
@@ -40,7 +40,7 @@ route, just map all requests for /assets/.\* to
 
 ## Starting Errbit
 Errbit comes with some capistrano tasks to manage running Errbit under
-unicorn.
+puma.
 To start Errbit, you can run:
 ```bash
 bundle exec cap production puma:start
--
libgit2 0.21.2