Combine master.sh and setup.sh scripts

Master.sh on a new system actually fails because it
needs some of what is done in setup.sh to run first.

This script combines both functions and creates a
_master_ parameter that enables the previous
master.sh function.

The master and setup scripts are left for historical
purposes