added cacheDir handling, but plugins still need to make use of it
Merge branch 'master' of https://github.com/jefdaj/gitit

Conflicts:
	testwiki/testwiki.conf