Merge js updates
Conflict resolved
Messing with poltergeist
Merge remote-tracking branch 'upstream/master'
Vimeo functionality added to delayed job
Merge remote-tracking branch 'upstream/master'
Dashboard video icons