Django 1.6 compatibility fixes (import location changes)

Django 1.6 compatibility fixes
Fix footer Disqus link
Merge pull request #10 from disqus/fix-footer-link

Fix footer Disqus link
Merge pull request #9 from mapmyfitness/master

Django 1.6 compatibility fixes (import location changes)
Merge pull request #2 from disqus/master

latest from upstream