diff --git a/.travis.yml b/.travis.yml
index 52872b7..eff3088 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,4 +5,4 @@ elixir:
   - 1.3.0
 before_script:
   - export SCRIVENER_ECTO_DB_USER=postgres
-  - MIX_ENV=test mix scrivener.ecto.db.reset
+  - MIX_ENV=test mix db.reset
diff --git a/README.md b/README.md
index 2782ed1..6f56cc2 100644
--- a/README.md
+++ b/README.md
@@ -72,7 +72,7 @@ end
 First, you'll need to build the test database.
 
 ```elixir
-MIX_ENV=test mix scrivener.ecto.db.reset
+MIX_ENV=test mix db.reset
 ```
 
 This task assumes you have postgres installed and that your current user can create / drop databases. If you'd prefer to use a different user, you can specify it with the environment variable `SCRIVENER_ECTO_DB_USER`.
diff --git a/lib/mix/tasks/scrivener/ecto/db/reset.ex b/lib/mix/tasks/scrivener/ecto/db/reset.ex
deleted file mode 100644
index e488259..0000000
--- a/lib/mix/tasks/scrivener/ecto/db/reset.ex
+++ /dev/null
@@ -1,13 +0,0 @@
-defmodule Mix.Tasks.Scrivener.Ecto.Db.Reset do
-  use Mix.Task
-
-  @moduledoc false
-
-  def run(_args) do
-    Logger.configure(level: :error)
-
-    Mix.Task.run("ecto.drop", [])
-    Mix.Task.run("ecto.create", [])
-    Mix.Task.run("ecto.migrate", [])
-  end
-end
diff --git a/mix.exs b/mix.exs
index 2af20b2..73b1243 100644
--- a/mix.exs
+++ b/mix.exs
@@ -10,6 +10,7 @@ defmodule Scrivener.Ecto.Mixfile do
       package: package,
       description: "Paginate your Ecto queries with Scrivener",
       deps: deps,
+      aliases: aliases,
       docs: [
         main: "readme",
         extras: [
@@ -19,6 +20,16 @@ defmodule Scrivener.Ecto.Mixfile do
     ]
   end
 
+  defp aliases do
+    [
+      "db.reset": [
+        "ecto.drop",
+        "ecto.create",
+        "ecto.migrate"
+      ]
+    ]
+  end
+
   def application do
     [
       applications: applications(Mix.env)
@@ -34,7 +45,7 @@ defmodule Scrivener.Ecto.Mixfile do
       {:ecto, "~> 2.0"},
       {:dialyxir, "~> 0.3.0", only: :dev},
       {:earmark, ">= 0.0.0", only: :dev},
-      {:ex_doc, "~> 0.11.0", only: :dev},
+      {:ex_doc, "~> 0.13.0", only: :dev},
       {:postgrex, "~> 0.11.2", optional: true}
     ]
   end
diff --git a/mix.lock b/mix.lock
index 1997cf9..918d812 100644
--- a/mix.lock
+++ b/mix.lock
@@ -1,12 +1,12 @@
-%{"connection": {:hex, :connection, "1.0.3", "3145f7416be3df248a4935f24e3221dc467c1e3a158d62015b35bd54da365786", [:mix], []},
-  "db_connection": {:hex, :db_connection, "1.0.0-rc.2", "c5b2329651ef046d85e47ec2c947cb0e3d10a69eb49fdb71e365e72d6758e4c5", [:mix], [{:sbroker, "~> 1.0.0-beta.2", [hex: :sbroker, optional: true]}, {:poolboy, "~> 1.5", [hex: :poolboy, optional: true]}, {:connection, "~> 1.0.2", [hex: :connection, optional: false]}]},
+%{"connection": {:hex, :connection, "1.0.4", "a1cae72211f0eef17705aaededacac3eb30e6625b04a6117c1b2db6ace7d5976", [:mix], []},
+  "db_connection": {:hex, :db_connection, "1.0.0-rc.4", "fad1f772c151cc6bde82412b8d72319968bc7221df8ef7d5e9d7fde7cb5c86b7", [:mix], [{:connection, "~> 1.0.2", [hex: :connection, optional: false]}, {:poolboy, "~> 1.5", [hex: :poolboy, optional: true]}, {:sbroker, "~> 1.0.0-beta.3", [hex: :sbroker, optional: true]}]},
   "decimal": {:hex, :decimal, "1.1.2", "79a769d4657b2d537b51ef3c02d29ab7141d2b486b516c109642d453ee08e00c", [:mix], []},
-  "dialyxir": {:hex, :dialyxir, "0.3.3", "2f8bb8ab4e17acf4086cae847bd385c0f89296d3e3448dc304c26bfbe4b46cb4", [:mix], []},
+  "dialyxir": {:hex, :dialyxir, "0.3.5", "eaba092549e044c76f83165978979f60110dc58dd5b92fd952bf2312f64e9b14", [:mix], []},
   "dialyze": {:hex, :dialyze, "0.2.1"},
-  "earmark": {:hex, :earmark, "0.2.1", "ba6d26ceb16106d069b289df66751734802777a3cbb6787026dd800ffeb850f3", [:mix], []},
-  "ecto": {:hex, :ecto, "2.0.1", "cf97a4d353e14af3d3cc3b4452cfbd18b3aeee1fb4075475efeccec3853444a9", [:mix], [{:poison, "~> 1.5 or ~> 2.0", [hex: :poison, optional: true]}, {:sbroker, "~> 1.0-beta", [hex: :sbroker, optional: true]}, {:mariaex, "~> 0.7.7", [hex: :mariaex, optional: true]}, {:postgrex, "~> 0.11.2", [hex: :postgrex, optional: true]}, {:db_connection, "~> 1.0-rc.2", [hex: :db_connection, optional: true]}, {:decimal, "~> 1.0", [hex: :decimal, optional: false]}, {:poolboy, "~> 1.5", [hex: :poolboy, optional: false]}]},
-  "ex_doc": {:hex, :ex_doc, "0.11.5", "0dc51cb84f8312162a2313d6c71573a9afa332333d8a332bb12540861b9834db", [:mix], [{:earmark, "~> 0.1.17 or ~> 0.2", [hex: :earmark, optional: true]}]},
+  "earmark": {:hex, :earmark, "1.0.1", "2c2cd903bfdc3de3f189bd9a8d4569a075b88a8981ded9a0d95672f6e2b63141", [:mix], []},
+  "ecto": {:hex, :ecto, "2.0.4", "03fd3b9aa508b1383eb38c00ac389953ed22af53811aa2e504975a3e814a8d97", [:mix], [{:db_connection, "~> 1.0-rc.2", [hex: :db_connection, optional: true]}, {:decimal, "~> 1.0", [hex: :decimal, optional: false]}, {:mariaex, "~> 0.7.7", [hex: :mariaex, optional: true]}, {:poison, "~> 1.5 or ~> 2.0", [hex: :poison, optional: true]}, {:poolboy, "~> 1.5", [hex: :poolboy, optional: false]}, {:postgrex, "~> 0.11.2", [hex: :postgrex, optional: true]}, {:sbroker, "~> 1.0-beta", [hex: :sbroker, optional: true]}]},
+  "ex_doc": {:hex, :ex_doc, "0.13.0", "aa2f8fe4c6136a2f7cfc0a7e06805f82530e91df00e2bff4b4362002b43ada65", [:mix], [{:earmark, "~> 1.0", [hex: :earmark, optional: false]}]},
   "ex_spec": {:hex, :ex_spec, "1.0.0", "b1e791072fecbf80c725adf45e7cbdf3d96af3765638a1f1547824706ece4bc9", [:mix], []},
   "poolboy": {:hex, :poolboy, "1.5.1", "6b46163901cfd0a1b43d692657ed9d7e599853b3b21b95ae5ae0a777cf9b6ca8", [:rebar], []},
   "postgrex": {:hex, :postgrex, "0.11.2", "139755c1359d3c5c6d6e8b1ea72556d39e2746f61c6ddfb442813c91f53487e8", [:mix], [{:connection, "~> 1.0", [hex: :connection, optional: false]}, {:db_connection, "~> 1.0-rc", [hex: :db_connection, optional: false]}, {:decimal, "~> 1.0", [hex: :decimal, optional: false]}]},
-  "scrivener": {:hex, :scrivener, "2.0.0", "38e59a1c37e989c40a22c019da245a86b257182aee45a074292c9038fab39678", [:mix], []}}
+  "scrivener": {:hex, :scrivener, "2.1.0", "ee6ffed875001c81c27cac6074723790f12591da36a3e94f1db5ce1c9bd931e8", [:mix], []}}