Package maintenance.

Un-vendor packages that are now on melpa.

Deal with some more ergoemacs irritants.