added py3k to travis
replaced `assertIn`s and `assertNotIn`s with `assertContains` and `assertNotContains`
Fixed merge conflicts