Update deprecated test plugins.
Another test plugin fix.
Add MANIFEST.SKIP to help avoid stupid mistake I made yesterday.
Merge remote-tracking branch 'dzil-base/master'

Conflicts:
	MANIFEST.SKIP