Properly support templates in sip.conf
Got comments working on same line as title
Additional test for having a comment after a title on the next line