Merge changes to HttpdConfigParser
Merge branch 'queries'
Merge branch 'queries'
Rename README to README.md
Merge branch 'terminals'
Merge changes for parsers.
Merge branch 'master' into terminals