Fixed spurious callback cache warning & load failure
Merge branch 'master' of github.com:dxw/whippet

Conflicts:
	lib/callback-cache.class.php