Merge pull request #166 from dracos/patch-1

Fix Socket NameError
Merge pull request #167 from dracos/patch-2

Pass user to store_token, not username