reorganized init.el, commented out unused stuff
switch emms to original repo