set up events model and starting controller testing
merge master with chris work on Events model Tues evening