style login
Merge pull request #13 from ahsterling/tools

Tools
merge conflicts resolved
Merge pull request #14 from ahsterling/steph

Steph
adds test for set_user_id
another test for set_user_id