Reinstate python-mode and remove jedi