Fix template, remove q_stmt, py cleanup
Merge pull request #346 from bhuber/topic/fix-sms-template

Topic/fix sms template