Remove redundant reset-html5, global-reset already calls reset-html5
Merge pull request #1300 from daphotron/master

Remove redundant reset-html5 call
update octopress
Merge branch 'up' into source