Added a note about django 1.7
bugfix
updated comment
Merge branch 'master' of github.com:knagra/farnsworth