Fix nosetests
Merge branch 'master' of github.com:eigenhombre/graph