Avoid clashing field errors in django 1.7 #16