Merge remote-tracking branches 'origin/master' and 'origin/d3-wordcloud'
hopefully final tweaks...