unify format of vim modelines
Merge branch 'modeline-cleanup'