Moved imports and setup/teardown into TestFramework module
MOved setup and teardown and imports into TestFramework class
Merge remote-tracking branch 'origin/master'

Conflicts:
	nose_local.py
Moved imports and setup/teardown into TestFramework module