Decorate the user for leaderboard
Merge branch 'master' of heroku.com:envato-hilander
Use values if they've been provided from a query
Merge branch 'master' of https://github.com/ejoubaud/highlander