Add MANIFEST.SKIP to help avoid stupid mistake I made yesterday.
Allow timeout callbacks.
Merge remote-tracking branch 'dzil-base/master'

Conflicts:
	MANIFEST.SKIP