Cleaning up some cruft, using MELPA instead of maintaining some vendor directory packages.