Added the sorts of things to __init__.py that belong in __init__.py