Change ListTokensForUser method to support new findByClientIdAndUserID
Merge remote-tracking branch 'upstream/master'
Merge pull request #99 from MartyBurns/master

Incorporate Don's Change ListTokensForUser method to support new findByClientIdAndUserID