Change __init__ to avoid overlapping imports, keep Travis from failing