Put version-sensitive code in if-branch
Add imenu shortcut for emacs 23
Merge branch 'master' of https://github.com/samertm/dotfiles
made init.el more sane

Waiting for Emacs 24.4 and electric-indent-local-mode