diff --git a/_config.yml b/_config.yml
index ec2068e..3b034a9 100644
--- a/_config.yml
+++ b/_config.yml
@@ -11,3 +11,7 @@ exclude: [Gemfile, Gemfile.lock, vendor]
 gems: [bourbon, neat]
 sass:
   style: compressed
+
+# octopress settings
+post_ext: md
+page_ext: html
diff --git a/_octopress.yml b/_octopress.yml
deleted file mode 100644
index 6f83af2..0000000
--- a/_octopress.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-# Default extension for new posts and pages
-post_ext: md
-page_ext: html
-
-# Default templates for posts and pages
-# Found in _templates/
-post_layout: post
-page_layout: page
-
-# Format titles with titlecase?
-titlecase: true