Drop marmalade repo
Move ~/.emacs-site-local to ~/.emacs.d/site-local.el
Move face customizations to site-local.el