diff --git a/.editorconfig b/.editorconfig
index a2a28b4a..2675aeea 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -10,17 +10,14 @@ end_of_line = lf
 insert_final_newline = true
 trim_trailing_whitespace = true
 
-[*.hbs]
-insert_final_newline = false
-
 [*.json]
 indent_size = 2
 
-[*.md]
-trim_trailing_whitespace = false
+[*.feature]
+indent_size = 2
 
 [*.{yml,yaml}]
 indent_size = 2
 
-[Makefile]
-indent_style = tab
+[*.md]
+trim_trailing_whitespace = false
diff --git a/features/accept-follows.feature b/features/accept-follows.feature
index 316b879a..645f9bfd 100644
--- a/features/accept-follows.feature
+++ b/features/accept-follows.feature
@@ -10,17 +10,16 @@ Feature: We automatically accept Follow requests
     And "Alice" is in our Followers
 
   Rule: We can be followed multiple times by the same actor, but we only record them once
-
     Example: An actor attempts to follow us multiple times
-        Given an Actor "Person(Alice)"
-        And a "Follow(Us)" Activity "F1" by "Alice"
-        And a "Follow(Us)" Activity "F2" by "Alice"
-        When "Alice" sends "F1" to the Inbox
-        And "F1" is in our Inbox
-        And "Alice" sends "F2" to the Inbox
-        And "F2" is in our Inbox
-        Then an "Accept(F1)" Activity "A1" is created by "Us"
-        And an "Accept(F2)" Activity "A2" is created by "Us"
-        And Activity "A1" is sent to "Alice"
-        And Activity "A2" is sent to "Alice"
-        And "Alice" is in our Followers once only
+      Given an Actor "Person(Alice)"
+      And a "Follow(Us)" Activity "F1" by "Alice"
+      And a "Follow(Us)" Activity "F2" by "Alice"
+      When "Alice" sends "F1" to the Inbox
+      And "F1" is in our Inbox
+      And "Alice" sends "F2" to the Inbox
+      And "F2" is in our Inbox
+      Then an "Accept(F1)" Activity "A1" is created by "Us"
+      And an "Accept(F2)" Activity "A2" is created by "Us"
+      And Activity "A1" is sent to "Alice"
+      And Activity "A2" is sent to "Alice"
+      And "Alice" is in our Followers once only
diff --git a/features/create-note.feature b/features/create-note.feature
index ce3b83e9..c7b48340 100644
--- a/features/create-note.feature
+++ b/features/create-note.feature
@@ -1,40 +1,41 @@
 Feature: Creating a note
-    Scenario: Note content is validated against being empty
-        When we attempt to create a note with no content
-        Then the request is rejected with a 400
 
-    Scenario: Note content is validated against being invalid
-        When we attempt to create a note with invalid content
-        Then the request is rejected with a 400
+  Scenario: Note content is validated against being empty
+    When we attempt to create a note with no content
+    Then the request is rejected with a 400
 
-    Scenario: Created note is added to the Outbox
-        When we create a note "Note" with the content
-           """
-           Hello, world!
-           """
-        Then "Note" is in our Outbox
+  Scenario: Note content is validated against being invalid
+    When we attempt to create a note with invalid content
+    Then the request is rejected with a 400
 
-    Scenario: Created note is formatted
-        When we create a note "Note" with the content
-           """
-           Hello
-           World
-           """
-        Then "Note" is in our Outbox
-        And "Note" has the content "<p>Hello<br />World</p>"
+  Scenario: Created note is added to the Outbox
+    When we create a note "Note" with the content
+      """
+      Hello, world!
+      """
+    Then "Note" is in our Outbox
 
-    Scenario: Created note is sent to followers
-        Given an Actor "Person(Alice)"
-        And an Actor "Person(Bob)"
-        And a "Follow(Us)" Activity "F1" by "Alice"
-        And a "Follow(Us)" Activity "F2" by "Bob"
-        And "Alice" sends "F1" to the Inbox
-        And "F1" is in our Inbox
-        And "Bob" sends "F2" to the Inbox
-        And "F2" is in our Inbox
-        When we create a note "Note" with the content
-           """
-           Hello, world!
-           """
-        Then Activity "Note" is sent to "Alice"
-        And Activity "Note" is sent to "Bob"
+  Scenario: Created note is formatted
+    When we create a note "Note" with the content
+      """
+      Hello
+      World
+      """
+    Then "Note" is in our Outbox
+    And "Note" has the content "<p>Hello<br />World</p>"
+
+  Scenario: Created note is sent to followers
+    Given an Actor "Person(Alice)"
+    And an Actor "Person(Bob)"
+    And a "Follow(Us)" Activity "F1" by "Alice"
+    And a "Follow(Us)" Activity "F2" by "Bob"
+    And "Alice" sends "F1" to the Inbox
+    And "F1" is in our Inbox
+    And "Bob" sends "F2" to the Inbox
+    And "F2" is in our Inbox
+    When we create a note "Note" with the content
+      """
+      Hello, world!
+      """
+    Then Activity "Note" is sent to "Alice"
+    And Activity "Note" is sent to "Bob"