django 1.6 imports
Merge branch 'master' of https://github.com/dpwrussell/webtagging_search