Merge pull request #42 from MoonshotProject/pe-runtime-config

I saw some small changes regarding unit test and karma, does it actually make watching ok?
Merge branch 'master' into pe-dispatch