Tons 'o tweaks, plus reconfigure building nodes

Conflicts:

	kalite/management/commands/integrate_local_content.py
	kalite/shared/topic_tools.py
	kalite/shared/videos.py
	kalite/utils/general.py
Merge branch 'lex_crossmerge_1' into local_content_tools

Conflicts:
	kalite/shared/i18n.py
	kalite/shared/topic_tools.py
	kalite/shared/videos.py
Fixed a few issues that were introduced via all the new changes