Merging new "matrix forms" which were missed in previous commit, adding more output data.
Merge branch 'master' of https://github.com/TedStudley/Advection-Diffusion-Codes