Remove trailing spaces for lint to be happy
Merge from head.  Minor README tweaks