Fixed bug in convolution. (No longer writing into the same buffer it's reading from.)
Merge branch 'master' of https://github.com/nratliff/workspace