CPBL doesn't want a few of the silly plugins and removed them
So CPBL also removed the nyan reference from .emacs
Merged in my own changes made locally...

Conflicts:
	.emacs