New music, icons, use flags, lok & feel.
Merge branch 'master' of github.com:pharpend/dotfiles

Conflicts:
	general/home/.Xresources
	general/home/.emacs.d/config/lf.el
	general/home/.icons/default/index.theme