Minor documentation/haddock fixes
Merge pull request #23 from DougBurke/master

Minor documentation fixes