improved hacky convolution
Merge branch 'master' of http://github.com/agile-geoscience/notebooks