Merge branch 'nostrademons-housekeeping', updating README and THANKS files.
Merge upstream.
Merge branch 'master' of https://github.com/google/gumbo-parser
Add MacOS X Travis CI support.
Merge pull request #280 from nostrademons/travis_mac

Add MacOS X Travis CI support