Jul 31 2014
Merge branch 'master' of https://github.com/madhusv/Talkweb

Conflicts:
	devtools/prepare~
	setup.py
	talk/tools/deploy
	talk/vocab.py