1.0.1 release
Merge branch 'release-1.0.1'
python 2.6 does not have unittest2 in the standard library