Merged in scottzirkel/html-starter