Always list name before slug so that they appear in correct order in adm...

Closes #1097 

I don't think there is anything contentious with these changes. For example the South migrations don't need changing, but would be good to have someone else have a ponder too.