merge

This is an attempt to resync my fork.  Please feel free to reject this if my awkward git skills are just getting me into more trouble.  Because it says "Able to Merge. These branches can be automatically merged." I am hoping this won't actually require action from you.  Let's find out...