Bring previous theme update into master on octopress