Merge pull request #572 from k88hudson/master

Fix makerstrap conflict with .video-container
Move makerstrap .video-container overrides