Fix header utils regexes, match quoted form, match correct character list
Merge pull request #64 from hamishforbes/master

Header util regex fixes