minor mapping changes
conflict resolution
Merge branch 'master' of github.com:bmschmidt/BookwormD3
handle more types of counts, albeit silently
merge fixes
adding scatterplot