Minor WS fixes
Minor WS indentation fixes
Add setup.ini for non-default setup configuration

setup.ini is ignored, the inactive but copy under version control is
setup.ini.dist.