Reordering of options.
Change of snippets to matchers.
Conversion of snippets into matchers.
Formatters now use the matchers, not snippets.
Merge branch 'matcher' into develop