merge master in and resolve conflicts.

.travis.yml

@@ -6,7 +6,7 @@ otp_release:
   - 18.0
 elixir:
   - 1.1.0
-  - 1.2.3
+  - 1.2.6
 env:
   - MIX_ENV=test
 script:
@@ -21,4 +21,4 @@ notifications:
       - https://webhooks.gitter.im/e/cad77fdb5cda2050ced8
     on_success: change
     on_failure: always
-    on_start: false
+    on_start: false

README.md

@@ -4,7 +4,7 @@
 [![Gitter](https://badges.gitter.im/rkotze/eye_drops.svg)](https://gitter.im/rkotze/eye_drops?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
 [![Hex pm](https://img.shields.io/hexpm/v/eye_drops.svg?style=flat)](https://hex.pm/packages/eye_drops)
 
-### A configurable mix task to watch file changes
+### A configurable Elixir mix watch task
 
 `mix eye_drops` Start watching all configured tasks ... [more options](#optional-switches)
 
@@ -27,7 +27,7 @@ Add `eye_drops` to your list of dependencies in `mix.exs`:
 
 ```elixir
 def deps do
-  [{:eye_drops, "~> 1.2.0"}]
+  [{:eye_drops, "~> 1.2"}]
 end
 ```
 
@@ -106,4 +106,4 @@ Run `mix eye_drops` from outside of vagrant in host terminal where the mix.exs f
 3. Create your feature branch (`git checkout -b my-new-feature`)
 4. Commit your changes (`git commit -am 'Add some feature'`)
 5. Push to the branch (`git push origin my-new-feature`)
-6. Create new Pull Request
+6. Create new Pull Request

mix.exs

@@ -3,8 +3,8 @@ defmodule Mix.Tasks.EyeDrops.Mixfile do
 
   def project do
     [app: :eye_drops,
-     version: "1.2.0",
-     elixir: ">= 1.1.0 and <= 1.3.4",
+     version: "1.2.1",
+     elixir: "~> 1.1",
      build_embedded: Mix.env == :prod,
      start_permanent: Mix.env == :prod,
      deps: deps,