Set this in formatoptions to prevent autoformatting
Modify my statusline so I can see who is setting fo for me
Merge branch 'master' into edge