merge with html5-boilerplate