Added fireworks to events.
Merge remote-tracking branch 'origin/jack' into dwkns

Conflicts:
	Gemfile
	app/views/shows/edit.html.erb
Few small timeline CSS and JS changes
Tidied up shows/edit and shows controller