Merge branch 'master' into GSOC-Integrator
Allow multiple single character arguments (Analyser),
as described in the documentation. Minor config/setup changes.
Merge branch 'GSOC-Integrator'