Refactored scoring
Merge branch 'master' into redis

Conflicts:
	server/queues/scoring.coffee
Simulation fixes
Merge pull request #385 from codecombat/redis

Merge redis into master