Merge pull request #16 from wikipathways/master

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

Fixes wikipathways/pathvisiojs#116