file index tweak, sort modules
Merge branch 'master' of github.com:calliopeinitiative/marca