Cleanup packages to use MELPA only, whitespace cleanup.