Merge branch 'master' into Jason-Branch
Merge branch 'master' into Jason-Branch
Leaderboard works!

Basically. Needs some fixes though.
Merge pull request #75 from mreist/master

Getting master
Merge pull request #77 from mreist/Jay

Getting up to date
Merge pull request #79 from mreist/Jason-Branch

Jason branch