Merge in updates from HTML5 Boilerplate
Merge pull request #917 from roots/h5bp-updates

Merge in updates from HTML5 Boilerplate