Merge pull request #14 from wikipathways/master

update ap:master with latest work and builds from wp:master
updates to config files
Merge pull request #104 from AlexanderPico/master

updates to config files