merge from octopress 2.1: support slugs & titles for categories