Merge remote-tracking branch 'origin/develop' into develop
got rid of a lot of junk
append tab and pound to eol in scmllist regardless of whether there's a descrip