TST: Use local unittest for python 2.6 compatability in test_geocode
Revert "TST: unittest2 didn't like skipIf"

This reverts commit e70ea78321749b8229fdfd1b359b050af1c25a34.
TST: Use local unittest for python 2.6 compatability in test_types