Merge pull request #242 from jwendl/master

Merging in changes that were deployed to PROD
Merge pull request #244 from jwendl/master

Updating leaderboard queries so they ignore employees with an employment...
Merge pull request #59 from Magenic/master

Merging changes locally.