Fix convolution with latest Astropy version
Try and use latest stable matplotlib
Merge pull request #145 from astrofrog/fix-convolution

Fix convolution with latest Astropy version
Merge remote-tracking branch 'upstream/master'