Manually remove pyc from manage.py, as our major refactors are really hurting our ability to update without this.
Default to latest version (not text 'latest'), get from 'downloads'
Merge pull request #1721 from bcipolli/installer-stats

Default to latest version (not text 'latest'), get from 'downloads'
Adding Travis CI setup file.
Update README.md
Update README.md
Fix for #1636: select thumbnail format from a list instead of hard-coding to png.
Template changes to toggle behavior based on whether a thumbnail is available.
Make travis show stack trace on any fatal error.
Merge pull request #1889 from bcipolli/1826

Fix for #1826: CSV download throw an unexpected error
update jshint config
Merge pull request #1873 from bcipolli/1636

Fix for #1636: select thumbnail format from a list instead of hard-coding to png.
Merge branch 'master' of github.com:learningequality/ka-lite into nalanda-rct1

Conflicts:
	.travis.yml
	kalite/manage.py
	kalite/stats/api_urls.py
	kalite/stats/api_views.py
	kalite/updates/videos.py
add jshint to travis-ci
Fix for #1887: Enable fle_utils testing through Travis-CI
try to install grunt-cli on travis without sudo
Skipping tests needing Python 2.7 when running in Python 2.6
Merge pull request #1888 from bcipolli/1887

Fix for #1887: Enable fle_utils testing through Travis-CI
Merge branch 'master' of github.com:mauk81/ka-lite into nalanda-rct1

Conflicts:
	.travis.yml
	Gruntfile.js
Fixing up Gruntfile paths for the distributed server.