Branched to Scatter
Updated indices so beamlines come out correctly
Merge branch 'master' into Scatter