update/fix user model associations
revise tests based on new user model associations
add .DS-Store to gitignore file