devise user setup, views not yet
cleaned up models, and associations
resolved conflicts in routes and gemfile