Added elpy, update keybindings