Merge pull request #9 from mapmyfitness/master

Django 1.6 compatibility fixes (import location changes)
Merge remote-tracking branch 'upstream/master'
Remove use of adminmedia