updated changes
mergeMerge branch 'develop' of https://github.com/agile-geoscience/modelr into develop
fixed broken unit test
Merge branch 'develop' of https://github.com/agile-geoscience/modelr into develop

Merged with Ben.
fixed wiggle plot in util.py to match physical x-axes