reverting/fixing a the init file to include the old set of imports
adding a landscape.yml file; need to figure out no-member warnings
fix old merge conflict
Merge branch 'pypi_setup'