Merge branch 'master' into tornado-chris

Conflicts:
	wordbyword.py