Finished first draft of Haddock writer.
Added haddock template.
More polish on Haddock reader/writer.
Added haddock writer tests.
Revised haddock reader tests for changes in reader.