Implement cache-busting scheme

Conflicts:
	shell.py
Merge pull request #2 from lidavidm/p2.7

Implement cache-busting scheme