Updated for python3k goodness

Also compiled the regex for more efficient searching!