Alpha kwarg fix

Found another bug in #1505.  My change ignored the alpha kwarg, this patch fixes it.

It also updates the way line color is handled (so alpha can be specified via kwarg or via a 4-tuple color), and updates the test to catch (I think) all of the permutations of marker, line, 4-tuple and