updating default cache time; was broken on some platforms
Merge branch 'performance' into moviecounts

Conflicts:
	kalite/settings.py
Merge branch 'moviecounts' into IDOC_demo

Conflicts:
	kalite/settings.py