CI updates - fix and drop lines that cause json errors
Merge branch 'master' of github.com:eghm/rtools