readding nsnitro.py
Moved default username/pw to tests.py
Merge branch 'master' into devel

Conflicts:
	nsnitro/nsnitro.py
Merge pull request #3 from robison/devel

Moved default username/pw to tests.py