some changes to tests
Merge in mike withs ome testing to my master
got Events model tested and set up and added to line item
events model testing. One pending for CSV
merged in master to chris master 9pm thurs
merge in chris2 into master--with Events model set up and event_id in line item and most event model testing