Clean up story format in commit messages

[Stories: ]
Better ID handling in commit messages

[Stories: ]
Oops

[Stories: ]