Don't split up imenu till it's huge.
Use the bundle python-mode now.

The include emacs-mode in emacs24 is fine.