Convolution

Attempts to clarify the code around convolutions. Includes bugfix for off by one error on matched points & tests for convolution.