fixed the wonky wiggle plot and image plot issue. Imageplots have scalesnow
model.png different
fixed merge errors
Merge branch 'develop' of https://github.com/agile-geoscience/modelr into develop