refactor tests, user login work
Merge pull request #11 from gopher-snakes-2013/user-added

refactor tests, user login work
Merged master onto this branch and resolved a bunch of conflicts