De-underscore a couple loops that could become problems.
Merge branch 'master' of https://github.com/nprapps/bestsongs14