more tests: users dwellings
Resolving merge conflict in user model
Merge pull request #10 from brandonmanson/assoc_and_seed

more tests: users dwellings