Move unittest2 and mock into hard deps
Merge pull request #116 from kennknowles/unittest2-dep

Move unittest2 and mock into hard deps