Vimeo js refactored
joyride back on video show page
Merge remote-tracking branch 'upstream/master'