Django 1.6 compatibility fixes (import location changes)

Django 1.6 compatibility fixes
Merge pull request #9 from mapmyfitness/master

Django 1.6 compatibility fixes (import location changes)