Fixed #312 -- add py.test to the dependencies
Merge branch 'master' of github.com:topazproject/topaz