Merge pull request #1 from farin/master

Django 1.6 support, thanks!