August 5th changes
Merge branch 'master' of https://github.com/madhusv/Talkweb

Conflicts:
	devtools/prepare~
	talk/tools/deploy
	talk/vocab.py
	ui/base.pyc
	ui/cell.pyc
	ui/event.pyc
	ui/isatype.pyc