Merge pull request #18 from willtsay/tommy

Tommy
Merge pull request #19 from willtsay/tommy

Added the auth_token and s_id tokens to the users db
made a small deletion of a comment from the rakefile