Wired up associations
Wrote authentication stuff back into user model