Merge pull request #32 from wikipathways/master

update ap:master with latest work and builds from wp:master
Fixes wikipathways/pathvisiojs#210
Merge pull request #211 from AlexanderPico/master

Fixes wikipathways/pathvisiojs#210