Move unittest2 and mock into hard deps
remove unused function
Merge pull request #119 from dimagi/remove-dead-code

remove unused function
Merge pull request #116 from kennknowles/unittest2-dep

Move unittest2 and mock into hard deps
Merge branch 'datespans' of github.com:dimagi/dimagi-utils into datespans
Merge branch 'master' of github.com:dimagi/dimagi-utils into datespans