python 3 compatibility
Django 1.7 compatibility
Merge pull request #17 from frensjan/master

Python 3 and Django 1.7 compatibility
Merge pull request #3 from jbalogh/master

merged latest from upstream