Fixed failures in django1.7
Merge branch 'master' of https://github.com/knagra/farnsworth