diff --git a/.gitignore b/.gitignore
index 7073810a..1e521a84 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,5 @@ _build
 dist
 build
 venv
+.idea
+*.sqlite
diff --git a/.travis.yml b/.travis.yml
index 1ff91a3b..7d69fa34 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
 language: python
 env:
-  - DJANGO="django>=1.7,<1.8"
+  - DJANGO="django>=1.7,<1.9"
 python:
   - "2.7"
 # command to install dependencies
diff --git a/provider/__init__.py b/provider/__init__.py
index f9014086..b2a95f90 100644
--- a/provider/__init__.py
+++ b/provider/__init__.py
@@ -1 +1 @@
-__version__ = "1.1"
+__version__ = "1.2"
diff --git a/provider/constants.py b/provider/constants.py
index b98c285d..cdbe9306 100644
--- a/provider/constants.py
+++ b/provider/constants.py
@@ -25,10 +25,10 @@
 
 SCOPES = getattr(settings, 'OAUTH_SCOPES', DEFAULT_SCOPES)
 
-EXPIRE_DELTA = getattr(settings, 'OAUTH_EXPIRE_DELTA', timedelta(days=365))
+EXPIRE_DELTA = getattr(settings, 'OAUTH_EXPIRE_DELTA', timedelta(days=7))
 
 # Expiry delta for public clients (which typically have shorter lived tokens)
-EXPIRE_DELTA_PUBLIC = getattr(settings, 'OAUTH_EXPIRE_DELTA_PUBLIC', timedelta(days=30))
+EXPIRE_DELTA_PUBLIC = getattr(settings, 'OAUTH_EXPIRE_DELTA_PUBLIC', timedelta(days=1))
 
 EXPIRE_CODE_DELTA = getattr(settings, 'OAUTH_EXPIRE_CODE_DELTA', timedelta(seconds=10 * 60))