Incorporating changes from main nml2 repo for gap junctions

Updated to v1.4.1