Matrix ionization: merge into matrix_test branch

@Higginbottom - I've opened the pull request we want - I assume matrix is the correct branch.