Updating setup.sh
Resolving merge
Locking EDNtuple
Locking EDNtuple
updating configuration
Changing base, toplevel scripts