Kill these uberlong lines
Minor updates
Merge pull request #45 from miekg/doc2

Doc updates