Support helm.el, use cl-labels instead of labels on Emacs 24.3+
Merge branch 'feature/helm-version' into develop