little bit of work in the docstrings
cherry-picked commit by palli: f648a4b2d74e8b041ac8adace9060f664dba35f0
a conflict had slipped through
A little more docstrings
Continued doc for pynag/Parsers
Some more docstrings
Finished first pass on docstrings
Merge with master
Try to fix doctests, and remove those that were not tests
Merge remote-tracking branch 'upstream/master' into sphinx-doc-test
Add unit tests for Model.get_current_status

Issue #137
Add status.dat path in FakeNagiosEnvironment
Fix get_current_status in Model

Fixes #137
Merge pull request #136 from ppepos/sphinx-doc-test

Good chunk of Sphinxish docstrings
Fix typo in Parsers.SshConfig
Minor pep8 cleanups in Model
FakeNagiosEnvironment: Add log paths
Fix unit test timeout handling for status.dat

it takes nagios a little while to create a status.dat file.
Let the unit tests be a little clever when waiting for nagios to do its thing
FakeNagiosEnvironment livestatus_socket_path patch

Allows the attribute livestatus_socket_path to be created
on on instanciation.
Incremental update of CHANGES