Fix travis config and add python 3.6 to test runner.

.travis.yml

@@ -1,13 +1,31 @@
 # Config file for automatic testing at travis-ci.org
 
 language: python
+matrix:
+  include:
+    - python: 2.7
+      env: TOXENV=django18-py27
+    - env: TOXENV=django19-py27
+    - env: TOXENV=django110-py27
+    - env: TOXENV=django111-py27
+    - python: 3.3
+      env: TOXENV=django18-py33
+    - python: 3.4
+      env: TOXENV=django18-py34
+    - env: TOXENV=django19-py34
+    - env: TOXENV=django110-py34
+    - env: TOXENV=django111-py34
+    - env: TOXENV=django20-py34
+    - python: 3.5
+      env: TOXENV=django18-py35
+    - env: TOXENV=django19-py35
+    - env: TOXENV=django110-py35
+    - env: TOXENV=django111-py35
+    - env: TOXENV=django20-py35
+    - python: 3.6
+      env: TOXENV=django111-py36
+    - env: TOXENV=django20-py36
 
-python:
-  - "2.7"
-  - "3.3"
-  - "3.4"
-  - "3.5"
-  - "3.6"
 
 before_install:
   - pip install codecov tox
@@ -18,22 +36,5 @@ install: pip install -r requirements-test.txt
 # command to run tests using coverage, e.g. python setup.py test
 script: tox
 
-env:
-  - TOXENV=django18-py27
-  - TOXENV=django19-py27
-  - TOXENV=django110-py27
-  - TOXENV=django18-py33
-  - TOXENV=django18-py34
-  - TOXENV=django19-py34
-  - TOXENV=django110-py34
-  - TOXENV=django18-py35
-  - TOXENV=django19-py35
-  - TOXENV=django110-py35
-  - TOXENV=django111-py27
-  - TOXENV=django111-py34
-  - TOXENV=django111-py35
-  - TOXENV=django20-py34
-  - TOXENV=django20-py35
-
 after_success:
   - codecov

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = django{18,19,110,111}-py{27,34,35}, django18-py33, django20-py{34,35}
+envlist = django{18,19,110,111}-py{27,34,35}, django111-py36, django18-py33, django20-py{34,35,36}
 
 
 [testenv]
@@ -8,6 +8,7 @@ basepython =
     py33: python3.3
     py34: python3.4
     py35: python3.5
+    py36: python3.6
 setenv =
     PYTHONPATH = {toxinidir}:{toxinidir}/disposable_email_checker
 commands = coverage run --source disposable_email_checker runtests.py