Added proper imenu support for ott-extras
Merge branch 'master' of https://github.com/EliasC/.emacs.d

Conflicts:
	site-lisp/ott-mode/ott-extras.el