Merge pull request #64 from streeter/patch-1

Test with Django 1.6

.travis.yml

@@ -1,8 +1,13 @@
 language: python
+env:
+ - DJANGO=1.6
+ - DJANGO=1.7
 python:
  - "2.6"
  - "2.7"
-install: pip install -r requirements.txt -r optional.txt --use-mirrors
+install:
+ - pip install -r requirements.txt -r optional.txt --use-mirrors
+ - pip install "Django<${DJANGO}" --use-mirrors
 script: DJANGO_SETTINGS_MODULE='django_statsd.test_settings' nosetests
 notifications:
   irc: "irc.mozilla.org#amo-bots"

requirements.txt

@@ -2,4 +2,4 @@ mock
 nose
 unittest2
 statsd>=2.0.0
-django<1.6
+django<1.7