More fixes to the plotting tools
Merge pull request #31 from g-weatherill/fixes_plotting_may14

More fixes to the plotting tools