Merge pull request #47 from andreweick/master

need to understand why the async didn't work
Merge pull request #48 from andreweick/video_js

Merge pull request #47 from andreweick/master