get nosetests working again and passing

putting us to 387 passing tests out of 387

we remain true to coding standard (twisted wise), with additional fixes and removal of deprecated code.

This has a cleaner history.

Using trial on python2.7 with twisted 14.0.0 gives this:
PASSED (expectedFailures=1, successes=440)
While I generally approve more of the style of indentation you've selected here, it's not like we have a coding-standard requirement for it or anything, and smaller diffs are better.  Could you maybe back out some of this whitespace shuffling so this is easier to review?