removed Gemfile.lock from being tracked and fixed problem with event model primary key