fixes infinate recursion on django 1.6
cleaned up
fix
fix backwards incompatibility
check for version
removed extra spacing
removed empty lines
Merge pull request #96 from fadur/master

fixes infinate recursion on django 1.6