Update for the sampling/mag/stride label.  Hopefully, this is a new
branch.
Merge branch 'master' into sampling
decodeColor checks for original string input argument in COLORNAMES,
instead of the result of several substring operations.  Fixes case of
"light gray" which was failing due to space in string
[1372]
Merge pull request #71 from mhiley/inq1372

display control bug: "light gray" option doesn't work

Nice catch!
Merge branch 'sampling'