Comment 3 for bug 1914625

Following up on Jason Boyer's comment, I have made the changes that he suggested:

Moved the vim mode to the bottom of the file and separated the indentation commit from the mode commit.

I also rebased the branch on master before doing the re-indentation.

I have force-pushed to the same location.