Added support for django 1.7
update requirements, refs #7
Merge branch 'cdkr-master'