Powerline añadido.
Merge branch 'master' of https://github.com/SanchezSobrino/emacs-config

Conflicts:
	.emacs
	elpa/archives/gnu/archive-contents
	elpa/archives/marmalade/archive-contents
	elpa/archives/melpa/archive-contents
	elpa/latex-extra-20140111.724/latex-extra-autoloads.el
	elpa/latex-extra-20140111.724/latex-extra-pkg.elc
	elpa/latex-extra-20140111.724/latex-extra.elc
	elpa/latex-pretty-symbols-20111011.546/latex-pretty-symbols-autoloads.el
	elpa/latex-pretty-symbols-20111011.546/latex-pretty-symbols-pkg.elc
	elpa/latex-pretty-symbols-20111011.546/latex-pretty-symbols.elc