Make a syntax highlighting section; turn modelines on
Rearranged sections in vimrc
Merge branch 'master' into project