Merge pull request #326 from codecombat/master

Merging master into production
Merge branch 'master' into production
Merge branch 'master' into production
Merge branch 'master' into production
Merge pull request #359 from codecombat/master

Merge master into production
Merge pull request #363 from codecombat/master

Merge master into production
Merge pull request #366 from codecombat/master

Merge master into production
Merge pull request #367 from codecombat/master

Manually specified tv4 version to fix npm checksum error
Merge branch 'master' into production
Merge branch 'master' into production
Merge branch 'master' into production
Merge branch 'master' into production
translate wizard settings
Merge pull request #384 from MartinDelille/translation

translate wizard settings
Refactored scoring
Merge branch 'master' into redis

Conflicts:
	server/queues/scoring.coffee
Added a route for getting user names by id.
Fixes for dirt path, fast portraits, and slow transpilation. Starting to move Aether stuff into a Tome worker with Catiline.
Merge remote-tracking branch 'origin/master'
Working on the ladder and team views.