putting token back in :( and fixed unit tests
Merge pull request #50 from dpgoetz/put_token_back_for_now

putting token back in :( and fixed unit tests