Issue with patching shorthand if
The current patcher for shorthand if's will put "end" after a comment if there is one:
`if (expression) expression --comment`
becomes
`if expression then expression --comment end`

It should detect if the line contains a comment and place the end before the comment.

EDIT:
I've also noticed the line regarding `or` reads `b:find('%f[%w]or%f[W]')`, should it read `b:find('%f[%w]or%f[%W]')` like the others?
