Merge pull request #13 from wikipathways/master

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

Fixes wikipathways/pathvisiojs#99