Clean up filetype.vim
Merge branch 'master' into edge
Clean up filetype.vim
Group the toggle buttons closer together
Group the toggle buttons closer together
Merge branch 'master' into edge