A few changes to the merged JSON functionality.

[joshuaehill]

• Resolves string compare issue in conditioning_main.cpp. Resolves usnistgov/SP800-90B_EntropyAssessment#186
• Change meaning of verbose flag. Now, verbose level 0 is for JSON output, level 1 is the normal mode, level 2 is the NIST tool verbose mode, and level 3 is for extra verbose output.
• Alter how quietMode works (now it uses verbose=0) Resolves usnistgov/SP800-90B_EntropyAssessment#184
• No longer compares boolean values with -1. Resolves usnistgov/SP800-90B_EntropyAssessment#185
• Caused output of JSON error report when the testing fails in restart_main.cpp. Resolves usnistgov/SP800-90B_EntropyAssessment#183

[joshuaehill]

This commit also changes the line termination convention in the following files:

• collision_test.h
• compression_test.h
• markov_test.h
• utils.h
• most_common.h

For some reason these files used DOS-style line breaks (CR LF) rather than UNIX style line breaks (LF). The rest of the source tree seems to be consistently UNIX-style line breaks, so after this change these files are consistent.

You can get a better rendering of these changes by suppressing whitespace changes in the diff, by using git diff -b (which suppresses changes in only the number of whitespace characters).