Merge branch 'master', remote-tracking branch 'origin'
Added updated version of acf_phase2cal.py. Now going to update the settings.