Fix end-of-code-block template token regex
Add test for Windows-style line endings (CRLF ie \r\n) in template when using multiline code block
Merge pull request #683 from njogun/master

Fix end-of-code-block template token regex