Merge pull request #1 from kaufmo/master

Yaml and HTML5shiv