a few hotkeys, testing out EDE
Merge branch 'master' into emacs24
EIN Jedi integration
Merge branch 'master' into emacs24