Merge pull request #36 from shankari/gamification

Post-deployment fixes