changed user and event associations so a user has created_events and commented_events
Merge branch 'master' into UserAssoc
created some commented-out tests for user assocaitions
uncommented the User associations ...oops