Major cleanup. Use MELPA for packages.