Merge branches 'master' and 'master' of https://github.com/learningequality/ka-lite into develop

Conflicts:
	README.md
ignore virtualenv generated directories
Merge remote-tracking branch 'upstream/develop' into develop
Merge remote-tracking branch 'upstream/develop' into develop
Merge remote-tracking branch 'refs/remotes/upstream/develop' into develop

Conflicts:
	.gitignore
	README.md
Merge remote-tracking branch 'refs/remotes/upstream/develop' into develop
port 'with' statement to try catch clause (ZipFile can't be a context manager yet by 2.6)

Conflicts:
	kalite/utils/platforms.py
use 'finally' clause to ensure zfile.close() is called
Merge remote-tracking branch 'refs/remotes/upstream/develop' into develop
Merge pull request #787 from aronasorman/develop

Change 'with' statement in utils/platforms.py to a 'try' clause
YEAH!!!!