Somewhat fix for Emacs configs, still waiting for elpy 1.1 to release in a week or two then everything will be automated.