Added emms
Merge branch 'master' of https://github.com/Willifme/dot-files

Conflicts:
	ac-comphist.dat
	elpa/archives/gnu/archive-contents~
	elpa/archives/marmalade/archive-contents
	elpa/archives/marmalade/archive-contents~
	elpa/archives/melpa/archive-contents
	elpa/archives/melpa/archive-contents~
	init.el
Fixed init.el