Elpa.
LaTeX pretty symbols in math mode.
Merge branch 'master' of github.com:muldvang/dotfiles

Conflicts:
	.emacs.d/elpa/archives/marmalade/archive-contents
	.emacs.d/elpa/archives/melpa/archive-contents