Merge in updates from HTML5 Boilerplate