update work on setupscripts to match current documentation
Merge branch 'master' of github.com:carpe-noctem-cassel/cnc-naos