Refactored scoring
Merge branch 'master' into redis

Conflicts:
	server/queues/scoring.coffee
Added a route for getting user names by id.
Merge remote-tracking branch 'origin/master'
Working on the ladder and team views.
Fixed some popover and modal layout and bugs.
hour of code trivial fix
Merge branch 'master' of https://github.com/codecombat/codecombat
Fixed spell palette doc duplication.
Working on the ladder and team views.
Fixing a bug with the tome problem view.
Merge branch 'master' of https://github.com/codecombat/codecombat
Simulation fixes
Fixed home wizard scale.
Merge branch 'master' of https://github.com/codecombat/codecombat
Fixes for the ladder team view.
Merge branch 'master' of https://github.com/codecombat/codecombat
Merge pull request #385 from codecombat/redis

Merge redis into master
Fix for opponent teams not working.
Merged