Merged with octopress standard files