Require unittest2 on travis for python2.6

This will fix the failing test.
Update s3 test to import unittest2

Same thing as botocore, tests can import
tests.unittest and it will pick the appropriate
version.
Merge branch 'develop' into table-output

This pulls in the changes to fix the failing s3 test in py26.