Conditionally import from nose.tools.nontrivial to support running tests on el6.
Merge pull request #196 from fedora-infra/feature/nontrivial

Conditionally import from nose.tools.nontrivial to support running tests...