Fixes for command line validation
Merged test refactor
Style cleanup.
Merge from upstream.
Cleanup after merge.
Else style cleanup.
Merge pull request #19 from arb/validation

Validation