updated migrations and events to match database schema
added migration to remove old event columns
Merge branch 'master' of github.com:kujenga/rails_lynda

Conflicts:
	app/controllers/events_controller.rb