Updated plot functions
Merge branch 'master' of github.com:mjharrigan/flux
Updated former user plots to work with new data structures