Add noclusterr and noclusterw options to the options list.  I forgot these when I implemented clustering.
Add noclusterr and noclusterw options to the options list.  I forgot these
when I implemented clustering.

jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase,jrobhoward/SCADAbase