Merge remote-tracking branch 'origin/master'

Author: mariodev

.travis.yml

@@ -1,6 +1,7 @@
 language: python
 python:
   - "2.7"
+  - "3.5"
 env:
   - DJANGO=1.7.11
   - DJANGO=1.8.9
@@ -9,6 +10,10 @@ install:
   - pip install -q Django==$DJANGO --use-mirrors
   - pip install coveralls
   - pip install -r rest_auth/tests/requirements.pip
+matrix:
+  exclude:
+    - python: "3.5"
+      env: DJANGO=1.7.11
 script:
   - coverage run --source=rest_auth setup.py test
 after_success: