Update clinker.py

Expanded and tested more regular expressions. Time to start using lxml!