Merge pull request #1 from matt-cahill/master

Adjusted sanity check for display numbers to account for 0 and below and...
Reorganize --display option validation