WIP rename files in cache
WIP rename cache files, merge

Merge branch 'master' of ssh://aldershot/home/git/jwutil

Conflicts:
	R/cache.r