Added emasc-jedi submodule
Some configuration refactoring