merged from jakevdps octopress theme