Fix indents in settings files
Put all solvers in single file.
Reflect the combination of the _gpu modules in the doc
Merge branch 'dev'