Fix augroups
Revise QuickFix settings
Merge branch 'master' into mac