Split out line and scatter from general plot.

This also happens to address issue #17.