MERGE from origin/master
Updated fplot.plot() to use style kwarg for FRET trace