Merge pull request #17 from NotSqrt/master

django 1.7 compatibility, tox, travis