Merge pull request #435 from jdufresne/unittest2

Drop dependency of unittest2; use stdlib unittest instead