Miscellaneous fixes from Neil's CF Build
Merge pull request #359 from nunit/merge-cf-code

Merge cf code