fix for bug586
Copyright-updating script now retains non-NYU/UIowa copyrights in files if present.
Merge branch '1.4.x'