refined comments_controller test to be less brittle, hasty bugfixes
fixed merge conflict with comments controller and factory girl tests
Merge pull request #3 from jenwen/add-users

Add users