Merge "Add nose to run_tests and tox for python 2.6"