Update to use six.moves for simplify import of libraries that have moved. All tests passing for pythons other than 3