Remove unneeded line from plot.py
Add **kwargs to all feature vectors
Merge branch 'ccollins'