Include the step number in all step yaml files. Use the second person in all include files.

Merging this.