making getting system user more robust
Merge pull request #82 from bcipolli/django_locale_bug

Avoid installation failure when locale cannot be determined
Use M2Crypto's PBKDF2 (if available) for password-hashing, for efficiency

Woooo 40x speedup on the Pi!
Decrease the number of password-hashing iterations for student accounts.
Fixes to address requests in code review #84.

https://github.com/learningequality/ka-lite/pull/84
Removed use_m2crypto argument as requested in pull request #84.
Cleaned up PBKDF2 code for review #84.
Merge pull request #84 from jamalex/m2crypto_password_hashing

M2Crypto password hashing
Finally found the place where slug_key and title_key belong: utils/topics.py, where they already are\! :D
Use command-line arg to start server on a specified port
Add API key to subtitles
Merge pull request #108 from bcipolli/enable_subtitles

Enable subtitles; they're broken
Merge remote-tracking branch 'upstream/hotfix' into develop
Merge pull request #104 from bcipolli/start_any_port

Allow port to be specified from the command-line
Merge pull request #98 from bcipolli/settings_only

moving slug_key and title_key out of settings.py
separating main and central urls and views into their respective apps
separating main and central templates more completely
separate central and main apps in settings
setting up an efficient test runner for KA Lite (no registration tests, etc)
Merge remote-tracking branch 'origin/test_runner' into separate_server_code