Changes to plotting
Ignoring egg-info
Merge conflicts resolved