Fix npm in travis CI
Try the other npm fix
Try one other travis change.
Yet another travis permutation
Merge branch 'master' into chore-upgrade-libs