Add current NDesk.Options 0.2.1
Rework debug output and add command line option support
Save correct test output
add alternate test shim