Fix 'Conflicting models' in django 1.7

re #16