Merge remote branch 'origin/feature/7303_peak_identification'
Merge remote branch 'origin/feature/7281_single_widget'
Re #7299. Added a bunch of tests for Material.

Still on the list of things to do is to return actual atoms which
will bring more of the error checking into a single location.
Merge branch 'feature/7299_material_tests' into develop