Moved the beamlinename configuration option to beamline setup.
Removed incorrect comment.
Updated example files.