updates in packages
Merge branch 'master' of https://github.com/codychan/dotemacs.d

Conflicts:
	elpa/archives/melpa/archive-contents
	elpa/helm-20140522.1034/emacs-helm.sh
	elpa/helm-20140522.1034/helm-adaptative.el
	elpa/helm-20140522.1034/helm-adaptative.elc
	elpa/helm-20140522.1034/helm-aliases.el
	elpa/helm-20140522.1034/helm-aliases.elc
	elpa/helm-20140522.1034/helm-apt.el
	elpa/helm-20140522.1034/helm-apt.elc
	elpa/helm-20140522.1034/helm-autoloads.el
	elpa/helm-20140522.1034/helm-bbdb.el
	elpa/helm-20140522.1034/helm-bbdb.elc
	elpa/helm-20140522.1034/helm-bookmark.el
	elpa/helm-20140522.1034/helm-bookmark.elc
	elpa/helm-20140522.1034/helm-buffers.el
	elpa/helm-20140522.1034/helm-buffers.elc
	elpa/helm-20140522.1034/helm-call-tree.el
	elpa/helm-20140522.1034/helm-call-tree.elc
	elpa/helm-20140522.1034/helm-color.el
	elpa/helm-20140522.1034/helm-color.elc
	elpa/helm-20140522.1034/helm-command.el
	elpa/helm-20140522.1034/helm-command.elc
	elpa/helm-20140522.1034/helm-config.el
	elpa/helm-20140522.1034/helm-config.elc
	elpa/helm-20140522.1034/helm-dabbrev.el
	elpa/helm-20140522.1034/helm-dabbrev.elc
	elpa/helm-20140522.1034/helm-elisp-package.el
	elpa/helm-20140522.1034/helm-elisp-package.elc
	elpa/helm-20140522.1034/helm-elisp.el
	elpa/helm-20140522.1034/helm-elisp.elc
	elpa/helm-20140522.1034/helm-elscreen.el
	elpa/helm-20140522.1034/helm-elscreen.elc
	elpa/helm-20140522.1034/helm-emms.el
	elpa/helm-20140522.1034/helm-emms.elc
	elpa/helm-20140522.1034/helm-eshell.el
	elpa/helm-20140522.1034/helm-eshell.elc
	elpa/helm-20140522.1034/helm-eval.el
	elpa/helm-20140522.1034/helm-eval.elc
	elpa/helm-20140522.1034/helm-external.el
	elpa/helm-20140522.1034/helm-external.elc
	elpa/helm-20140522.1034/helm-files.el
	elpa/helm-20140522.1034/helm-files.elc
	elpa/helm-20140522.1034/helm-firefox.el
	elpa/helm-20140522.1034/helm-firefox.elc
	elpa/helm-20140522.1034/helm-font.el
	elpa/helm-20140522.1034/helm-font.elc
	elpa/helm-20140522.1034/helm-gentoo.el
	elpa/helm-20140522.1034/helm-gentoo.elc
	elpa/helm-20140522.1034/helm-grep.el
	elpa/helm-20140522.1034/helm-grep.elc
	elpa/helm-20140522.1034/helm-help.el
	elpa/helm-20140522.1034/helm-help.elc
	elpa/helm-20140522.1034/helm-imenu.el
	elpa/helm-20140522.1034/helm-imenu.elc
	elpa/helm-20140522.1034/helm-info.el
	elpa/helm-20140522.1034/helm-info.elc
	elpa/helm-20140522.1034/helm-locate.el
	elpa/helm-20140522.1034/helm-locate.elc
	elpa/helm-20140522.1034/helm-man.el
	elpa/helm-20140522.1034/helm-man.elc
	elpa/helm-20140522.1034/helm-match-plugin.el
	elpa/helm-20140522.1034/helm-match-plugin.elc
	elpa/helm-20140522.1034/helm-misc.el
	elpa/helm-20140522.1034/helm-misc.elc
	elpa/helm-20140522.1034/helm-mode.el
	elpa/helm-20140522.1034/helm-mode.elc
	elpa/helm-20140522.1034/helm-net.el
	elpa/helm-20140522.1034/helm-net.elc
	elpa/helm-20140522.1034/helm-org.el
	elpa/helm-20140522.1034/helm-org.elc
	elpa/helm-20140522.1034/helm-pkg.elc
	elpa/helm-20140522.1034/helm-plugin.el
	elpa/helm-20140522.1034/helm-plugin.elc
	elpa/helm-20140522.1034/helm-regexp.el
	elpa/helm-20140522.1034/helm-regexp.elc
	elpa/helm-20140522.1034/helm-ring.el
	elpa/helm-20140522.1034/helm-ring.elc
	elpa/helm-20140522.1034/helm-semantic.el
	elpa/helm-20140522.1034/helm-semantic.elc
	elpa/helm-20140522.1034/helm-sys.el
	elpa/helm-20140522.1034/helm-sys.elc
	elpa/helm-20140522.1034/helm-tags.el
	elpa/helm-20140522.1034/helm-tags.elc
	elpa/helm-20140522.1034/helm-utils.el
	elpa/helm-20140522.1034/helm-utils.elc
	elpa/helm-20140522.1034/helm-w3m.el
	elpa/helm-20140522.1034/helm-w3m.elc
	elpa/helm-20140522.1034/helm-yaoddmuse.el
	elpa/helm-20140522.1034/helm-yaoddmuse.elc
	elpa/helm-20140522.1034/helm.el
	elpa/helm-20140522.1034/helm.elc
	elpa/helm-20140523.639/emacs-helm.sh
	elpa/helm-20140523.639/helm-adaptative.el
	elpa/helm-20140523.639/helm-adaptative.elc
	elpa/helm-20140523.639/helm-aliases.el
	elpa/helm-20140523.639/helm-aliases.elc
	elpa/helm-20140523.639/helm-apt.el
	elpa/helm-20140523.639/helm-apt.elc
	elpa/helm-20140523.639/helm-autoloads.el
	elpa/helm-20140523.639/helm-bbdb.el
	elpa/helm-20140523.639/helm-bbdb.elc
	elpa/helm-20140523.639/helm-bookmark.el
	elpa/helm-20140523.639/helm-bookmark.elc
	elpa/helm-20140523.639/helm-buffers.el
	elpa/helm-20140523.639/helm-buffers.elc
	elpa/helm-20140523.639/helm-call-tree.el
	elpa/helm-20140523.639/helm-call-tree.elc
	elpa/helm-20140523.639/helm-color.el
	elpa/helm-20140523.639/helm-color.elc
	elpa/helm-20140523.639/helm-command.el
	elpa/helm-20140523.639/helm-command.elc
	elpa/helm-20140523.639/helm-config.el
	elpa/helm-20140523.639/helm-config.elc
	elpa/helm-20140523.639/helm-dabbrev.el
	elpa/helm-20140523.639/helm-dabbrev.elc
	elpa/helm-20140523.639/helm-elisp-package.el
	elpa/helm-20140523.639/helm-elisp-package.elc
	elpa/helm-20140523.639/helm-elisp.el
	elpa/helm-20140523.639/helm-elisp.elc
	elpa/helm-20140523.639/helm-elscreen.el
	elpa/helm-20140523.639/helm-elscreen.elc
	elpa/helm-20140523.639/helm-emms.el
	elpa/helm-20140523.639/helm-emms.elc
	elpa/helm-20140523.639/helm-eshell.el
	elpa/helm-20140523.639/helm-eshell.elc
	elpa/helm-20140523.639/helm-eval.el
	elpa/helm-20140523.639/helm-eval.elc
	elpa/helm-20140523.639/helm-external.el
	elpa/helm-20140523.639/helm-external.elc
	elpa/helm-20140523.639/helm-files.el
	elpa/helm-20140523.639/helm-files.elc
	elpa/helm-20140523.639/helm-firefox.el
	elpa/helm-20140523.639/helm-firefox.elc
	elpa/helm-20140523.639/helm-font.el
	elpa/helm-20140523.639/helm-font.elc
	elpa/helm-20140523.639/helm-gentoo.el
	elpa/helm-20140523.639/helm-gentoo.elc
	elpa/helm-20140523.639/helm-grep.el
	elpa/helm-20140523.639/helm-grep.elc
	elpa/helm-20140523.639/helm-help.el
	elpa/helm-20140523.639/helm-help.elc
	elpa/helm-20140523.639/helm-imenu.el
	elpa/helm-20140523.639/helm-imenu.elc
	elpa/helm-20140523.639/helm-info.el
	elpa/helm-20140523.639/helm-info.elc
	elpa/helm-20140523.639/helm-locate.el
	elpa/helm-20140523.639/helm-locate.elc
	elpa/helm-20140523.639/helm-man.el
	elpa/helm-20140523.639/helm-man.elc
	elpa/helm-20140523.639/helm-match-plugin.el
	elpa/helm-20140523.639/helm-match-plugin.elc
	elpa/helm-20140523.639/helm-misc.el
	elpa/helm-20140523.639/helm-misc.elc
	elpa/helm-20140523.639/helm-mode.el
	elpa/helm-20140523.639/helm-mode.elc
	elpa/helm-20140523.639/helm-net.el
	elpa/helm-20140523.639/helm-net.elc
	elpa/helm-20140523.639/helm-org.el
	elpa/helm-20140523.639/helm-org.elc
	elpa/helm-20140523.639/helm-pkg.elc
	elpa/helm-20140523.639/helm-plugin.el
	elpa/helm-20140523.639/helm-plugin.elc
	elpa/helm-20140523.639/helm-regexp.el
	elpa/helm-20140523.639/helm-regexp.elc
	elpa/helm-20140523.639/helm-ring.el
	elpa/helm-20140523.639/helm-ring.elc
	elpa/helm-20140523.639/helm-semantic.el
	elpa/helm-20140523.639/helm-semantic.elc
	elpa/helm-20140523.639/helm-sys.el
	elpa/helm-20140523.639/helm-sys.elc
	elpa/helm-20140523.639/helm-tags.el
	elpa/helm-20140523.639/helm-tags.elc
	elpa/helm-20140523.639/helm-utils.el
	elpa/helm-20140523.639/helm-utils.elc
	elpa/helm-20140523.639/helm-w3m.el
	elpa/helm-20140523.639/helm-w3m.elc
	elpa/helm-20140523.639/helm-yaoddmuse.el
	elpa/helm-20140523.639/helm-yaoddmuse.elc
	elpa/helm-20140523.639/helm.el
	elpa/helm-20140523.639/helm.elc
	elpa/helm-20140524.117/emacs-helm.sh
	elpa/helm-20140524.117/helm-adaptative.el
	elpa/helm-20140524.117/helm-adaptative.elc
	elpa/helm-20140524.117/helm-aliases.el
	elpa/helm-20140524.117/helm-aliases.elc
	elpa/helm-20140524.117/helm-apt.el
	elpa/helm-20140524.117/helm-apt.elc
	elpa/helm-20140524.117/helm-autoloads.el
	elpa/helm-20140524.117/helm-bbdb.el
	elpa/helm-20140524.117/helm-bbdb.elc
	elpa/helm-20140524.117/helm-bookmark.el
	elpa/helm-20140524.117/helm-bookmark.elc
	elpa/helm-20140524.117/helm-buffers.el
	elpa/helm-20140524.117/helm-buffers.elc
	elpa/helm-20140524.117/helm-call-tree.el
	elpa/helm-20140524.117/helm-call-tree.elc
	elpa/helm-20140524.117/helm-color.el
	elpa/helm-20140524.117/helm-color.elc
	elpa/helm-20140524.117/helm-command.el
	elpa/helm-20140524.117/helm-command.elc
	elpa/helm-20140524.117/helm-config.el
	elpa/helm-20140524.117/helm-config.elc
	elpa/helm-20140524.117/helm-dabbrev.el
	elpa/helm-20140524.117/helm-dabbrev.elc
	elpa/helm-20140524.117/helm-elisp-package.el
	elpa/helm-20140524.117/helm-elisp-package.elc
	elpa/helm-20140524.117/helm-elisp.el
	elpa/helm-20140524.117/helm-elisp.elc
	elpa/helm-20140524.117/helm-elscreen.el
	elpa/helm-20140524.117/helm-elscreen.elc
	elpa/helm-20140524.117/helm-emms.el
	elpa/helm-20140524.117/helm-emms.elc
	elpa/helm-20140524.117/helm-eshell.el
	elpa/helm-20140524.117/helm-eshell.elc
	elpa/helm-20140524.117/helm-eval.el
	elpa/helm-20140524.117/helm-eval.elc
	elpa/helm-20140524.117/helm-external.el
	elpa/helm-20140524.117/helm-external.elc
	elpa/helm-20140524.117/helm-files.el
	elpa/helm-20140524.117/helm-files.elc
	elpa/helm-20140524.117/helm-firefox.el
	elpa/helm-20140524.117/helm-firefox.elc
	elpa/helm-20140524.117/helm-font.el
	elpa/helm-20140524.117/helm-font.elc
	elpa/helm-20140524.117/helm-gentoo.el
	elpa/helm-20140524.117/helm-gentoo.elc
	elpa/helm-20140524.117/helm-grep.el
	elpa/helm-20140524.117/helm-grep.elc
	elpa/helm-20140524.117/helm-help.el
	elpa/helm-20140524.117/helm-help.elc
	elpa/helm-20140524.117/helm-imenu.el
	elpa/helm-20140524.117/helm-imenu.elc
	elpa/helm-20140524.117/helm-info.el
	elpa/helm-20140524.117/helm-info.elc
	elpa/helm-20140524.117/helm-locate.el
	elpa/helm-20140524.117/helm-locate.elc
	elpa/helm-20140524.117/helm-man.el
	elpa/helm-20140524.117/helm-man.elc
	elpa/helm-20140524.117/helm-match-plugin.el
	elpa/helm-20140524.117/helm-match-plugin.elc
	elpa/helm-20140524.117/helm-misc.el
	elpa/helm-20140524.117/helm-misc.elc
	elpa/helm-20140524.117/helm-mode.el
	elpa/helm-20140524.117/helm-mode.elc
	elpa/helm-20140524.117/helm-net.el
	elpa/helm-20140524.117/helm-net.elc
	elpa/helm-20140524.117/helm-org.el
	elpa/helm-20140524.117/helm-org.elc
	elpa/helm-20140524.117/helm-pkg.elc
	elpa/helm-20140524.117/helm-plugin.el
	elpa/helm-20140524.117/helm-plugin.elc
	elpa/helm-20140524.117/helm-regexp.el
	elpa/helm-20140524.117/helm-regexp.elc
	elpa/helm-20140524.117/helm-ring.el
	elpa/helm-20140524.117/helm-ring.elc
	elpa/helm-20140524.117/helm-semantic.el
	elpa/helm-20140524.117/helm-semantic.elc
	elpa/helm-20140524.117/helm-sys.el
	elpa/helm-20140524.117/helm-sys.elc
	elpa/helm-20140524.117/helm-tags.el
	elpa/helm-20140524.117/helm-tags.elc
	elpa/helm-20140524.117/helm-utils.el
	elpa/helm-20140524.117/helm-utils.elc
	elpa/helm-20140524.117/helm-w3m.el
	elpa/helm-20140524.117/helm-w3m.elc
	elpa/helm-20140524.117/helm-yaoddmuse.el
	elpa/helm-20140524.117/helm-yaoddmuse.elc
	elpa/helm-20140524.117/helm.el
	elpa/helm-20140524.117/helm.elc