Improved support for if statement auto end matching.  Now it will correctly handle if the if statement already  has a matching end tag - and won't add it in that case.  Still need to do more, and revisit end tags for other keywords like do and class.