Beamline head

Routine merging of beamline work into master branch