Follow/ Show video player title popover
Merge branch 'master' of https://github.com/grimmwerks/batterypopv2

Conflicts:
	app/views/episodes/_popunpop.html.erb
	app/views/shows/_follow_show.html.erb
	app/views/shows/show.html.erb
using yours.
I do hope this makes it sync
should accept your changes
Merge branch 'master' of https://github.com/grimmwerks/batterypopv2

Conflicts:
	app/views/episodes/_popunpop.html.erb
	app/views/shows/_follow_show.html.erb
	app/views/shows/show.html.erb
	app/views/users/index.html.erb